diff options
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2007-07-07 12:16:27 +0000 |
---|---|---|
committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2007-07-07 12:16:27 +0000 |
commit | 420c9b2a9c17e007ab12ad11517a7ef4a8bd6ed7 (patch) | |
tree | 4cb99e5b0af8312b25b0c6f77d45eb8e70781664 | |
parent | b9ff055d78ebdea1fdc038fa5304dbe3f9a51a7f (diff) | |
download | automake-420c9b2a9c17e007ab12ad11517a7ef4a8bd6ed7.tar.gz |
* aclocal.in (version): Fix output to match GCS requirements.
* automake.in (version): Likewise.
Report by Eric Blake.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | aclocal.in | 11 | ||||
-rwxr-xr-x | automake.in | 9 |
3 files changed, 15 insertions, 9 deletions
@@ -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 623513a99..4efb7afb3 100644 --- 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 7d1f0efe3..9bfff454a 100755 --- 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; |