Re: bug#11153: change automake branching policy: dispensing with the 'branch-X.Y' branches in the future

[Stefano Lattarini]

I've now implemented the proposed branching setup, with the following steps:

 - I have removed the old and outdated 'next' branch (which was an
   ancestor of the current 'master').

 - I have removed the 'branch-1.11' branch (whose tip pointed at
   the commit tagged by tag 'v1.11.5').

 - Now that 1.12 is out, I've merged master into maint (with a non
   fast-forward merge to keep this action visible in git history);

 - I have updated the version number in maint to 1.12.0a;

 - I have merged this new maint into master;

 - Finally, I have updated the version number in master to 1.12a.

I'm thus closing this bug report.  Let's hope the new policy will work
out for the best!

Thanks,
  Stefano

[FYI] {master} release: stable major release 1.12

[Stefano Lattarini]

* configure.ac (AC_INIT): Bump version number to 1.12.
* NEWS: Likewise.
* m4/amversion.m4 (AM_AUTOMAKE_VERSION): Likewise (autoupdated
by ./bootstrap).

Signed-off-by: Stefano Lattarini 
---
 NEWS|4 ++--
 configure.ac|2 +-
 m4/amversion.m4 |6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 75ca31f..4e49512 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.11e:
+New in 1.12:
 
 * WARNING: Future backward-incompatibilities!
 
@@ -224,7 +224,7 @@ New in 1.11e:
 '-Wall'.  In previous versions, one has to use '-Wextra-portability'
 to enable them.
 
-Bugs fixed in 1.11e:
+Bugs fixed in 1.12:
 
   - Various minor bugfixes for recent or long-standing bugs.
 
diff --git a/configure.ac b/configure.ac
index 0aa9c26..ec00d26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 # along with this program.  If not, see .
 
 AC_PREREQ([2.68])
-AC_INIT([GNU Automake], [1.11e], [bug-autom...@gnu.org])
+AC_INIT([GNU Automake], [1.12], [bug-autom...@gnu.org])
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 15c6dcb..b70bec2 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -14,10 +14,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.11e'
+[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.11e], [],
+m4_if([$1], [1.12], [],
   [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.11e])dnl
+[AM_AUTOMAKE_VERSION([1.12])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.9.5

Re: bug#11302: Automake 1.11d on openSUSE 12.1

[Stefano Lattarini]

severity 11302 minor
tags 11302 patch
close 11302
thanks

On 04/25/2012 01:22 AM, Bruno Haible wrote:
> 
> Yes, it fixes the test failures of
> 
>   t/posixsubst-libraries.sh
>   t/posixsubst-ltlibraries.sh
>   t/posixsubst-scripts.sh
>   t/transform3.sh
> 
Thanks for confirming.  I've pushed the patch,
and I'm closing this bug report.

Regards,
  Stefano

Re: bug#11306: Automake 1.11d on MacOS X

[Stefano Lattarini]

On 04/23/2012 12:51 PM, Stefano Lattarini wrote:
> On 04/22/2012 08:10 PM, Bruno Haible wrote:
>>
>> FAIL: t/lex-libobj
>>
>> But setting LEXLIB to just whitespace makes the test succeed:
>>
>> diff -r -u automake-1.11d.orig/t/lex-libobj.sh automake-1.11d/t/lex-libobj.sh
>> --- automake-1.11d.orig/t/lex-libobj.sh  2012-04-13 17:44:41.0 
>> +0200
>> +++ automake-1.11d/t/lex-libobj.sh   2012-04-22 20:01:27.0 +0200
>> @@ -68,7 +68,7 @@
>>  $MAKE distclean
>>  
>>  # Force "no system lex library".
>> -./configure LEXLIB='-L /lib'
>> +./configure LEXLIB=' '
>>  grep LIBOBJS Makefile # For debugging.
>>  grep '^LIBOBJS *=.*yywrap.*\.o' Makefile # Sanity check.
>>  $MAKE
>>
> Thanks.  I will apply the attached patch then (comments and reviews welcome).
>
Pushed now.  But I'm not yet closing the bug report, because the issue with
perl multithreading is still not properly understood.

Regards,
  Stefano