[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12b-4-g929c20c

[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=929c20cc15c3188dd3bf7557ab3dad62c6db2178

The branch, master has been updated
       via  929c20cc15c3188dd3bf7557ab3dad62c6db2178 (commit)
       via  31d006502cb4fed4c6c5977630cefdf3b619ec24 (commit)
       via  4fd9dcd62759c21ba6324dd6861a49dbfae12fba (commit)
       via  72f22d497983b8881cbe277297e2f47dc800f788 (commit)
      from  9ebccd05291f99c446908e6485f338f4ea47ecf5 (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 929c20cc15c3188dd3bf7557ab3dad62c6db2178
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 19 12:16:27 2012 +0100

    maint: typofixes in makefile comments
    
    * maint.mk (git-upload-release): Here.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 31d006502cb4fed4c6c5977630cefdf3b619ec24
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 19 12:06:38 2012 +0100

    maint: remove extra verbosity from a maintainer rule
    
    * maint.mk (git-upload-release): Here, by adding a forgotten
    '@' recipe modifier.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 4fd9dcd62759c21ba6324dd6861a49dbfae12fba
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 19 12:05:08 2012 +0100

    NEWS: fix grammaro
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 72f22d497983b8881cbe277297e2f47dc800f788
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 19 12:02:21 2012 +0100

    maint: version bump after beta release
    
    * configure.ac (AC_INIT): Bump version number to 1.12c, as per
    HACKING suggestion.
    * m4/amversion.m4: Likewise (autoupdated by "make bootstrap").
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

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

diff --git a/NEWS b/NEWS
index c61ec15..e23396e 100644
--- a/NEWS
+++ b/NEWS
@@ -149,8 +149,8 @@ New in 1.13:
   - The 'missing' script no longer tries to update the timestamp of
     out-of-date files that require a maintainer-specific tool to be
     remade, in case the user lacks such a tool (or has a too-old version
-    of it).  It just give a useful warning, and in some cases also a tip
-    about how to obtain such a tool.
+    of it).  It just gives a useful warning, and in some cases also a
+    tip about how to obtain such a tool.
 
   - The missing script has thus become useless as a (poor) way to work
     around the sketched-timestamps issues that can happen for projects
diff --git a/configure.ac b/configure.ac
index 9925ab7..b17520c 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.12b], address@hidden)
+AC_INIT([GNU Automake], [1.12c], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 211fce7..3e87447 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.12b'
+[am__api_version='1.12c'
 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.12b], [],
+m4_if([$1], [1.12c], [],
       [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.12b])dnl
+[AM_AUTOMAKE_VERSION([1.12c])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/maint.mk b/maint.mk
index 9853e6d..97bbf9b 100644
--- a/maint.mk
+++ b/maint.mk
@@ -156,13 +156,13 @@ git-tag-release: maintainer-check
        $$run $(GIT) tag -s "v$(VERSION)" -m "$$release_type $(VERSION)"
 
 git-upload-release:
-       @# Check this a version we can cut a release release from the
-       @# current repository: we must have a beta version, and the
-       @# repository must be clean.
+       @# Check this is a version we can cut a release (either test
+       @# or stable) from.
        @$(determine_release_type)
+       @# The repository must be clean.
        @$(git_must_have_clean_workdir)
        @# Check that we are releasing from a valid tag.
-       tag=`$(GIT) describe` \
+       @tag=`$(GIT) describe` \
          && case $$tag in "v$(VERSION)") true;; *) false;; esac \
          || { echo "$@: you can only create a release from a tagged" \
                    "version" >&2; \


hooks/post-receive
-- 
GNU Automake