Hello, and a Happy New Year, I've applied this patch to master, and cherry-picked it into branch-1-10. I've also cherry-picked a patch to remove an ugly debugging leftover from automake.in. Also, one to regenerate all dependent files.
Cheers, Ralf Bump copyright years. * aclocal.in (write_aclocal, version): Likewise. * automake.in ($gen_copyright, version): Likewise. * doc/automake.texi: Likewise. diff --git a/ChangeLog b/ChangeLog index b967dcc..8fe1254 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-02 Ralf Wildenhues <[EMAIL PROTECTED]> + + Bump copyright years. + * aclocal.in (write_aclocal, version): Likewise. + * automake.in ($gen_copyright, version): Likewise. + * doc/automake.texi: Likewise. + 2007-12-18 Jim Meyering <[EMAIL PROTECTED]> * lib/gnupload (GPG): Don't use an absolute path. @@ -2338,7 +2345,7 @@ ----- -Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. +Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/aclocal.in b/aclocal.in index 690d879..0436205 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, 2007 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 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 @@ -815,7 +815,7 @@ $output"; $output = "# generated automatically by aclocal $VERSION -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -904,7 +904,7 @@ sub version() { print <<EOF; aclocal (GNU $PACKAGE) $VERSION -Copyright (C) 2007 Free Software Foundation, Inc. +Copyright (C) 2008 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. diff --git a/automake.in b/automake.in index fbc97b0..3720769 100755 --- a/automake.in +++ b/automake.in @@ -7,7 +7,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' # automake - create Makefile.in from Makefile.am # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ -244,7 +244,7 @@ my %standard_prefix = # Copyright on generated Makefile.ins. my $gen_copyright = "\ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -7708,7 +7708,7 @@ sub version () { print <<EOF; automake (GNU $PACKAGE) $VERSION -Copyright (C) 2007 Free Software Foundation, Inc. +Copyright (C) 2008 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. diff --git a/doc/automake.texi b/doc/automake.texi index 3b70557..e32b7c5 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -14,7 +14,7 @@ This manual is for @acronym{GNU} Automake (version @value{VERSION}, Makefiles from template files. Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document