On 12/22/2011 02:09 PM, Stefano Lattarini wrote: > On 12/10/2011 06:51 PM, Stefano Lattarini wrote: >> Another minor maintenance patch to be applied after the 1.11.2 release. >> > I've rebased the patch on latest maint, squashed in the fixlet below > (suggested by a more careful reading of HACKING), and pushed to maint. > And I've also pushed the attached follow-up.
Regards, Stefano
>From 90a927f4b6026807b768f249e2e15296fccd3bbc Mon Sep 17 00:00:00 2001 Message-Id: <90a927f4b6026807b768f249e2e15296fccd3bbc.1324560762.git.stefano.lattar...@gmail.com> From: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Thu, 22 Dec 2011 14:27:47 +0100 Subject: [PATCH] maint: snapshots from `maint' are still development snapshots The maintenance-oriented development line in the `maint' branch, while being usually pretty stable and 99% backward-compatible, is not always right off production-quality; but until now, the Automake package version declared in configure.ac hid this fact, since it appeared to be the version of a stable release (e.g., 11.1). Fix this. * configure.ac (AC_INIT): Bump version to "1.11a" --- ChangeLog | 11 +++++++++++ configure.ac | 2 +- m4/amversion.m4 | 6 +++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30cd146..c6429eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2011-12-22 Stefano Lattarini <stefano.lattar...@gmail.com> + maint: snapshots from `maint' are still development snapshots + The maintenance-oriented development line in the `maint' branch, + while being usually pretty stable and 99% backward-compatible, + is not always right off production-quality; but until now, the + Automake package version declared in configure.ac hid this fact, + since it appeared to be the version of a stable release (e.g., + 11.1). Fix this. + * configure.ac (AC_INIT): Bump version to "1.11a". + +2011-12-22 Stefano Lattarini <stefano.lattar...@gmail.com> + configure: print proper message for test releases * configure.ac: If the current release is detected to be a test release or a development snapshot, print a proper warning for diff --git a/configure.ac b/configure.ac index e73c16b..f9fe9f1 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ([2.68]) -AC_INIT([GNU Automake], [1.11], [bug-autom...@gnu.org]) +AC_INIT([GNU Automake], [1.11a], [bug-autom...@gnu.org]) m4_ifndef([AC_PACKAGE_URL], [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/software/automake/])]) diff --git a/m4/amversion.m4 b/m4/amversion.m4 index 9fd3c1e..c6a7adb 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -15,10 +15,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.11' +[am__api_version='1.11a' 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.11], [], +m4_if([$1], [1.11a], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -34,7 +34,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.11])dnl +[AM_AUTOMAKE_VERSION([1.11a])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -- 1.7.7.3
