[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.1

[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=58cad831c25194bc8b9e28c675d9bdec923f652e

The branch, maint has been updated
       via  58cad831c25194bc8b9e28c675d9bdec923f652e (commit)
       via  192d699aaa4d31da0d7e75481fcbb51aa6862605 (commit)
      from  423105aa0f9db7b6979e99d1a096dda03b2983d6 (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 58cad831c25194bc8b9e28c675d9bdec923f652e
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jun 1 15:50:03 2012 +0200

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

commit 192d699aaa4d31da0d7e75481fcbb51aa6862605
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jun 1 15:47:17 2012 +0200

    copyright: update copyright years in a couple of files
    
    * doc/help2man, t/aclocal-verbose-install.sh: Update copyright,
    thanks to "make update-copyright".
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 configure.ac                 |    2 +-
 doc/help2man                 |    3 +--
 m4/amversion.m4              |    4 ++--
 t/aclocal-verbose-install.sh |    2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6d93926..0958b0e 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.0c], address@hidden)
+AC_INIT([GNU Automake], [1.12.1], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
diff --git a/doc/help2man b/doc/help2man
index 45cb182..6b915bc 100755
--- a/doc/help2man
+++ b/doc/help2man
@@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
 
 # Generate a short man page from --help and --version output.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009,
-# 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 6bead79..660ea89 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.0c], [],
+m4_if([$1], [1.12.1], [],
       [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.0c])dnl
+[AM_AUTOMAKE_VERSION([1.12.1])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/t/aclocal-verbose-install.sh b/t/aclocal-verbose-install.sh
index 099fff4..594c607 100755
--- a/t/aclocal-verbose-install.sh
+++ b/t/aclocal-verbose-install.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


hooks/post-receive
-- 
GNU Automake