* aclocal.in (version): Fix output to match GCS requirements.

* automake.in (version): Likewise.
Report by Eric Blake.

diff --git a/ChangeLog b/ChangeLog
index f2d9489..be5c90e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-07-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * aclocal.in (version): Fix output to match GCS requirements.
+       * automake.in (version): Likewise.
+       Report by Eric Blake.
+
        * COPYING, lib/COPYING: Update to GPLv3.  All uses changed.
        * NEWS: Update.
 

diff --git a/aclocal.in b/aclocal.in
index 623513a..4efb7af 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -8,7 +8,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
 # aclocal - create aclocal.m4 by scanning configure.ac
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007  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
@@ -889,12 +889,13 @@ sub version()
 {
   print <<EOF;
 aclocal (GNU $PACKAGE) $VERSION
+Copyright (C) 2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
 Written by Tom Tromey <tromey\@redhat.com>
        and Alexandre Duret-Lutz <adl\@gnu.org>.
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 EOF
   exit 0;
 }

diff --git a/automake.in b/automake.in
index 7d1f0ef..9bfff45 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -7686,12 +7686,13 @@ sub version ()
 {
   print <<EOF;
 automake (GNU $PACKAGE) $VERSION
+Copyright (C) 2007 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
 Written by Tom Tromey <tromey\@redhat.com>
        and Alexandre Duret-Lutz <adl\@gnu.org>.
-
-Copyright 2006 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 EOF
   # --version always returns 0 per GNU standards.
   exit 0;