[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12-86-g16bf8eb

[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=16bf8ebc8156278699571ff92b47a923f242ace6

The branch, maint has been updated
       via  16bf8ebc8156278699571ff92b47a923f242ace6 (commit)
       via  0bec8b53f0c3808ee282d88dc0d86f8c1357073c (commit)
       via  a36a8f6e7f52521d3c5d9f382ab5a4e7676b42f1 (commit)
      from  91ac5d2cf4ad0f1b28776d06a713118a4b191a47 (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 16bf8ebc8156278699571ff92b47a923f242ace6
Author: Stefano Lattarini <address@hidden>
Date:   Sat May 19 15:27:21 2012 +0200

    maint: version bump after beta release
    
    * configure.ac (AC_INIT): Bump version number to 1.12.0c.
    * m4/amversion.m4: Likewise (auto-updated by "./bootstrap").
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 0bec8b53f0c3808ee282d88dc0d86f8c1357073c
Author: Stefano Lattarini <address@hidden>
Date:   Sat May 19 15:18:43 2012 +0200

    release: beta release 1.12.0b (will become 1.12.1)
    
    * configure.ac (AC_INIT): Bump version number to 1.12.0b.
    * m4/amversion.m4: Likewise (auto-updated by "./bootstrap").
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit a36a8f6e7f52521d3c5d9f382ab5a4e7676b42f1
Author: Stefano Lattarini <address@hidden>
Date:   Sat May 19 15:11:36 2012 +0200

    release: remove overly picky check
    
    * Makefile.am (git-tag-release): Do not check that the version number
    NEWS is updated w.r.t. $(VERSION); given the new way we manage NEWS,
    that would cause gratuitous spurious failures.
    * HACKING: Update.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 HACKING         |    8 ++++----
 Makefile.am     |    3 ---
 configure.ac    |    2 +-
 m4/amversion.m4 |    4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/HACKING b/HACKING
index 7ab4e7f..6966384 100644
--- a/HACKING
+++ b/HACKING
@@ -238,10 +238,10 @@
   ./bootstrap.sh && ./configure && make && make check && make distcheck
 
 * Run "make git-tag-release".
-  This will run the maintainer checks, check that the NEWS file is
-  up-to-date, check that the local git repository and working tree
-  are clean and up-to-date, and create a proper signed git tag for
-  the release (based on the contents of $(VERSION)).
+  This will run the maintainer checks, verify that the local git
+  repository and working tree are clean and up-to-date, and create
+  a proper signed git tag for the release (based on the contents
+  of $(VERSION)).
 
 * Run "make git-upload-release".
   This will first verify that you are releasing from a tagged version
diff --git a/Makefile.am b/Makefile.am
index f15ede4..8bd723e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -697,9 +697,6 @@ git-tag-release: maintainer-check
        esac; \
        $(determine_release_type); \
        $(git_must_have_clean_workdir); \
-## Make sure the NEWS file is up-to-date.
-       sed 1q $(srcdir)/NEWS | grep '$(VERSION)' >/dev/null \
-         || fatal "NEWS not updated"; \
 ## If all was successful, tag the release in the local repository.
        $$run $(GIT) tag -s "v$(VERSION)" -m "$$release_type $(VERSION)"
 
diff --git a/configure.ac b/configure.ac
index 7be2554..6d93926 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.0a], address@hidden)
+AC_INIT([GNU Automake], [1.12.0c], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index f6ed132..6bead79 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -17,7 +17,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.0a], [],
+m4_if([$1], [1.12.0c], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -33,7 +33,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.0a])dnl
+[AM_AUTOMAKE_VERSION([1.12.0c])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