[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-141-gf4643dc

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

The branch, ng/master has been updated
       via  f4643dc91abd6f39ac9175f4d66c04b2592228f0 (commit)
       via  140ce85ed89d28f8130c6dcf471408823c268a33 (commit)
       via  3687a13b055bfd6fb06ab27c9eb96eeee6e01341 (commit)
       via  96a78f138f40f3325bcbd813d2924e5630d46121 (commit)
       via  c1c27cf134f49bbe71ae919bf8c39dd9467795b9 (commit)
       via  5bcc8fa10fba5b0a504ff3735862359e878693a3 (commit)
      from  4980dc1f15c5516d46c434f21784d1d4e9707c40 (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 f4643dc91abd6f39ac9175f4d66c04b2592228f0
Merge: 4980dc1 140ce85
Author: Stefano Lattarini <address@hidden>
Date:   Tue May 1 14:06:33 2012 +0200

    Merge branch 'master' into ng/master
    
    * master:
      news: fix confusing wording
      news: fixed weaknesses in build system and testsuite
      bootstrap: consistently use correct copyright year
      fixup: remove leftover "TERM=ansi" definition in 't/color.sh'

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

Summary of changes:
 Makefile.am  |    5 +++--
 NEWS         |    9 +++++++--
 bootstrap.sh |    7 ++++---
 t/color.sh   |    3 ---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5e90109..4509e00 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -893,8 +893,9 @@ update_copyright_env = \
 update-copyright:
        $(AM_V_GEN)set -e; \
        current_year=`date +%Y` && test -n "$$current_year" \
-         || { echo "$@: cannot get current year" >&1; exit 1; }; \
-       sed -i "/^RELEASE_YEAR=/s/=.*$$/=$$current_year/" configure.ac; \
+         || { echo "$@: cannot get current year" >&2; exit 1; }; \
+       sed -i "/^RELEASE_YEAR=/s/=.*$$/=$$current_year/" \
+         bootstrap.sh configure.ac; \
        excluded_re=`echo $(FETCHFILES) \
          | sed -e 's|^|lib/|' -e 's| | lib/|g' -e 's, ,|,g'`; \
        $(GIT) ls-files \
diff --git a/NEWS b/NEWS
index a8f5dc2..13dbbce 100644
--- a/NEWS
+++ b/NEWS
@@ -34,8 +34,8 @@ New in 1.12.1:
 * WARNING: Future backward-incompatibilities!
 
   - Autoconf 2.65 or later will be required by the next major Automake
-    version (1.13).  Until now, Automake has been working with any
-    Autoconf version up to 2.62.
+    version (1.13).  Until now, Automake has required Autoconf version
+    2.62 or later.
 
   - Starting from the next major Automake version (1.13), the rules to
     build pdf, ps and dvi output from Texinfo input will use the '--tidy'
@@ -70,6 +70,11 @@ New in 1.12.1:
 
 Bugs fixed in 1.12.1:
 
+* Bugs introduced by 1.12:
+
+   - Several weaknesses in the Automake's own build system test suite
+     have been fixed.
+
 * Long-standing bugs:
 
   - When the 'color-tests' option is in use, forcing of colored testsuite
diff --git a/bootstrap.sh b/bootstrap.sh
index 2673b66..6607e14 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -36,6 +36,9 @@ VERSION=`sed -ne 
'/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac`
 PACKAGE=automake
 datadir=.
 PERL_THREADS=0
+# This should be automatically updated by the 'update-copyright'
+# rule of our Makefile.
+RELEASE_YEAR=2012
 
 # Override SHELL.  This is required on DJGPP so that Perl's system()
 # uses bash, not COMMAND.COM which doesn't quote arguments properly.
@@ -77,8 +80,6 @@ dosubst ()
 {
   rm -f $2
   in=`echo $1 | sed 's,^.*/,,'`
-  current_year=`date +%Y` && test -n "$current_year" \
-    || { echo "$me: cannot get current year" >&2; exit 1; }
   sed -e "address@hidden@%$APIVERSION%g" \
       -e "address@hidden@%$PACKAGE%g" \
       -e "address@hidden@%$PERL%g" \
@@ -86,7 +87,7 @@ dosubst ()
       -e "address@hidden@%$BOOTSTRAP_SHELL%g" \
       -e "address@hidden@%$VERSION%g" \
       -e "address@hidden@%$datadir%g" \
-      -e "address@hidden@%$current_year%g" \
+      -e "address@hidden@%$RELEASE_YEAR%G" \
       -e "address@hidden@%Generated from $in; do not edit by hand.%g" \
       $1 > $2
   chmod a-w $2
diff --git a/t/color.sh b/t/color.sh
index a08ea19..3804c03 100755
--- a/t/color.sh
+++ b/t/color.sh
@@ -19,9 +19,6 @@
 
 . ./defs || Exit 1
 
-TERM=ansi
-export TERM
-
 esc=''
 # Escape '[' for grep, below.
 red="$esc\[0;31m"


hooks/post-receive
-- 
GNU Automake