[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13-3-ge34c365

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=e34c3653a907db711d6e6e8f816ef6a975512384

The branch, master has been updated
       via  e34c3653a907db711d6e6e8f816ef6a975512384 (commit)
       via  ea33584cdac1597e90b3e2dbe4d3fd09d77bae0b (commit)
       via  a31c991e5f4d58f236e26ab4d3197aa68d564110 (commit)
      from  2f552a970f2e8c00f0fc01ad72ff995716be2a06 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e34c3653a907db711d6e6e8f816ef6a975512384
Merge: ea33584 a31c991
Author: Stefano Lattarini <address@hidden>
Date:   Fri Dec 28 18:58:45 2012 +0100

    Merge branch 'maint'
    
    Actually a dummy merge, since we retain our own "1.13a" version
    number.
    
    * maint:
      post-release: minor version bump
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit ea33584cdac1597e90b3e2dbe4d3fd09d77bae0b
Author: Stefano Lattarini <address@hidden>
Date:   Fri Dec 28 18:49:18 2012 +0100

    post-release: major version bump
    
    This is for the master branch.
    
    * configure.ac, m4/amversion.m4: Bump version to 1.13a.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 configure.ac    |    2 +-
 m4/amversion.m4 |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4ec7661..f97ec87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.69])
-AC_INIT([GNU Automake], [1.13], address@hidden)
+AC_INIT([GNU Automake], [1.13a], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 03f8c02..30d3871 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -12,10 +12,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13'
+[am__api_version='1.13a'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.13], [],
+m4_if([$1], [1.13a], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13])dnl
+[AM_AUTOMAKE_VERSION([1.13a])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])


hooks/post-receive
-- 
GNU Automake