[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.6-3-gb869415

[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=b869415eb63efcea39162fc24a69eb51d94c3c6b

The branch, maint has been updated
       via  b869415eb63efcea39162fc24a69eb51d94c3c6b (commit)
       via  f72c2300ef6043e81b38b6d6c3e9dbafca60253d (commit)
       via  c54fada1452911bfedebf3f170dc5d0fcd03cd8f (commit)
      from  28fcb35dc73d363ed2a5fe4eddf26770212496c9 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 HACKING                 |   24 ++++++++++++++----------
 configure.ac            |    2 +-
 m4/amversion.m4         |    4 ++--
 t/py-compile-destdir.sh |    2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/HACKING b/HACKING
index 4641d90..5dadf1b 100644
--- a/HACKING
+++ b/HACKING
@@ -280,23 +280,27 @@
   - Check for link errors, fix them, recheck until convergence:
     <http://validator.w3.org/checklink>
 
+* Create an announcement message with "make announcement".  Edit the
+  generated 'announcement' file appropriately, in particularly filling
+  in by hand any "TODO" left in there.
+
 * Update version number in configure.ac to next alpha number.
   Re-run ./bootstrap.sh and commit.
 
 * Don't forget to "git push" your changes so they appear in the public
   git tree.
 
-* Create an announcement message with "make announcement".  Edit the
-  generated 'announcement' file appropriately, in particularly filling
-  in by hand any "TODO" left in there.
-
-* Send the announcement at least to <address@hidden> and
-  <address@hidden>.  If the release is a stable one, the announcement
-  must also go to <address@hidden>; if it is an alpha or beta release,
-  announcement should be sent also to <address@hidden>, to
-  maximize the possibility of early testing on exotic or proprietary
-  systems.  Finally, copy the announcement into the NEWS feed at
+* Send the announcement generated in the earlier steps at least to
+  <address@hidden> and <address@hidden>.  If the release
+  is a stable one, the announcement must also go to <address@hidden>;
+  if it is an alpha or beta release, announcement should be sent also
+  to <address@hidden>, to maximize the possibility of early
+  testing on exotic or proprietary systems.  Finally, copy an abridged
+  version of the announcement into the NEWS feed at:
   <https://savannah.gnu.org/projects/automake>.
+  Be sure to link a  version to the complete announcement (from
+  the version you sent to the automake list, as get archived on
+  <http://lists.gnu.org/archive/html/automake/>).
 
 -----
 
diff --git a/configure.ac b/configure.ac
index 7670d58..543cf10 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.12.6], address@hidden)
+AC_INIT([GNU Automake], [1.12.6a], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 8f07860..5526895 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -15,7 +15,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.12'
 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.12.6], [],
+m4_if([$1], [1.12.6a], [],
       [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.12.6])dnl
+[AM_AUTOMAKE_VERSION([1.12.6a])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh
index ba666f6..55137f0 100755
--- a/t/py-compile-destdir.sh
+++ b/t/py-compile-destdir.sh
@@ -1,4 +1,4 @@
-    #! /bin/sh
+#! /bin/sh
 # Copyright (C) 2011-2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify


hooks/post-receive
-- 
GNU Automake