autoconf-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

update copyright, etc


From: Eric Blake
Subject: update copyright, etc
Date: Tue, 05 Jan 2010 21:35:11 -0700
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.23) Gecko/20090812 Thunderbird/2.0.0.23 Mnenhy/0.7.6.666

I'm pushing this, to add 2010 to the copyright lists and update upstream
files that have done likewise.  This also pulls in some improvements from
gnulib in the use of maintainer scripts, like update-copyright and
announce-gen.

-- 
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
From b95a1aea40eb6d09438fa45ee7897be7ab3776a2 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 5 Jan 2010 20:59:55 -0700
Subject: [PATCH 1/3] Update copyright year.

All files changed to add 2010, via 'make update-copyright'.

Signed-off-by: Eric Blake <address@hidden>
---
 AUTHORS                     |    4 ++--
 BUGS                        |    4 ++--
 ChangeLog                   |    7 ++++++-
 HACKING                     |    2 +-
 Makefile.am                 |    2 +-
 NEWS                        |    3 ++-
 README                      |    2 +-
 README-alpha                |    4 ++--
 README-hacking              |    2 +-
 THANKS                      |    2 +-
 TODO                        |    4 ++--
 bin/Makefile.am             |    2 +-
 bin/autoconf.as             |    3 ++-
 bin/autoheader.in           |    4 ++--
 bin/autom4te.in             |    4 ++--
 bin/autoreconf.in           |    2 +-
 bin/autoscan.in             |    2 +-
 bin/autoupdate.in           |    2 +-
 bin/ifnames.in              |    2 +-
 cfg.mk                      |    4 ++--
 configure.ac                |    3 ++-
 doc/Makefile.am             |    4 ++--
 doc/autoconf.texi           |    2 +-
 doc/install.texi            |    2 +-
 lib/Autom4te/C4che.pm       |    2 +-
 lib/Autom4te/ChannelDefs.pm |    4 ++--
 lib/Autom4te/General.pm     |    4 ++--
 lib/Autom4te/Makefile.am    |    2 +-
 lib/Autom4te/Request.pm     |    3 ++-
 lib/Makefile.am             |    2 +-
 lib/autoconf/Makefile.am    |    3 ++-
 lib/autoconf/autoconf.m4    |    4 ++--
 lib/autoconf/autoheader.m4  |    2 +-
 lib/autoconf/autoscan.m4    |    2 +-
 lib/autoconf/autotest.m4    |    2 +-
 lib/autoconf/autoupdate.m4  |    2 +-
 lib/autoconf/c.m4           |    4 ++--
 lib/autoconf/erlang.m4      |    2 +-
 lib/autoconf/fortran.m4     |    4 ++--
 lib/autoconf/functions.m4   |    2 +-
 lib/autoconf/general.m4     |    4 ++--
 lib/autoconf/headers.m4     |    2 +-
 lib/autoconf/lang.m4        |    4 ++--
 lib/autoconf/libs.m4        |    4 ++--
 lib/autoconf/oldnames.m4    |    2 +-
 lib/autoconf/programs.m4    |    2 +-
 lib/autoconf/specific.m4    |    2 +-
 lib/autoconf/status.m4      |    2 +-
 lib/autoconf/types.m4       |    4 ++--
 lib/autom4te.in             |    4 ++--
 lib/autoscan/Makefile.am    |    2 +-
 lib/autoscan/autoscan.pre   |    4 ++--
 lib/autotest/Makefile.am    |    2 +-
 lib/autotest/autotest.m4    |    3 ++-
 lib/autotest/general.m4     |    4 ++--
 lib/autotest/specific.m4    |    2 +-
 lib/emacs/autoconf-mode.el  |    2 +-
 lib/emacs/autotest-mode.el  |    2 +-
 lib/freeze.mk               |    2 +-
 lib/m4sugar/Makefile.am     |    2 +-
 lib/m4sugar/foreach.m4      |    2 +-
 lib/m4sugar/m4sh.m4         |    2 +-
 lib/m4sugar/m4sugar.m4      |    2 +-
 m4/m4.m4                    |    4 ++--
 m4/make-case.m4             |    2 +-
 maint.mk                    |    4 ++--
 man/Makefile.am             |    4 ++--
 tests/Makefile.am           |    2 +-
 tests/atlocal.in            |    4 ++--
 tests/autoscan.at           |    2 +-
 tests/autotest.at           |    2 +-
 tests/base.at               |    4 ++--
 tests/c.at                  |    4 ++--
 tests/compile.at            |    4 ++--
 tests/erlang.at             |    2 +-
 tests/foreign.at            |    4 ++--
 tests/fortran.at            |    4 ++--
 tests/local.at              |    2 +-
 tests/m4sh.at               |    2 +-
 tests/m4sugar.at            |    4 ++--
 tests/mktests.sh            |    2 +-
 tests/semantics.at          |    4 ++--
 tests/statesave.m4          |    2 +-
 tests/suite.at              |    2 +-
 tests/tools.at              |    4 ++--
 tests/torture.at            |    2 +-
 tests/wrapper.as            |    3 ++-
 87 files changed, 131 insertions(+), 119 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5ff9d04..4f9ed2a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -102,8 +102,8 @@ mode: text
 coding: utf-8
 End:

-Copyright (C) 1996, 2000, 2001, 2005, 2007, 2008, 2009 Free Software
-Foundation, Inc.
+Copyright (C) 1996, 2000, 2001, 2005, 2007, 2008, 2009, 2010 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/BUGS b/BUGS
index 274b5c1..17282e3 100644
--- a/BUGS
+++ b/BUGS
@@ -3,8 +3,8 @@
 This file lists the bugs you must be aware of.  Be sure to check this
 file before using Autoconf, and especially git versions of Autoconf.

-       Copyright (C) 2000, 2001, 2002, 2006, 2007, 2008, 2009 Free
-       Software Foundation, Inc.
+       Copyright (C) 2000, 2001, 2002, 2006, 2007, 2008, 2009, 2010
+       Free Software Foundation, Inc.

        Copying and distribution of this file, with or without
        modification, are permitted in any medium without royalty provided
diff --git a/ChangeLog b/ChangeLog
index 0143989..9e20e00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-05  Eric Blake  <address@hidden>
+
+       Update copyright year.
+       All files changed to add 2010, via 'make update-copyright'.
+
 2009-12-31  Bruno Haible  <address@hidden>

        Improve documentation on Solaris tr bugs.
@@ -20741,7 +20746,7 @@
        End:

        Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-       2009 Free Software Foundation, Inc.
+       2009, 2010 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
diff --git a/HACKING b/HACKING
index 563dec2..42e6a79 100644
--- a/HACKING
+++ b/HACKING
@@ -171,7 +171,7 @@ that needs to be updated.

 -----

-Copyright (C) 2002, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 2002, 2008, 2009, 2010 Free Software Foundation, Inc.

 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/Makefile.am b/Makefile.am
index 7891612..9f0c887 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Make Autoconf.

 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008,
-# 2009 Free Software Foundation, Inc.
+# 2009, 2010 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/NEWS b/NEWS
index 6c398f3..207325e 100644
--- a/NEWS
+++ b/NEWS
@@ -1951,7 +1951,8 @@ Various bug fixes.
 -----

 Copyright (C) 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+Inc.

 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/README b/README
index 5c74926..fd5591b 100644
--- a/README
+++ b/README
@@ -55,7 +55,7 @@ For more licensing information, see
 -----

 Copyright (C) 1992, 1993, 1994, 1998, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/README-alpha b/README-alpha
index dea7deb..dbfe7b7 100644
--- a/README-alpha
+++ b/README-alpha
@@ -22,8 +22,8 @@ users.

 -----

-Copyright (C) 2000, 2001, 2002, 2003, 2009 Free Software Foundation,
-Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2009, 2010 Free Software
+Foundation, Inc.

 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/README-hacking b/README-hacking
index e985f0b..0747d11 100644
--- a/README-hacking
+++ b/README-hacking
@@ -131,7 +131,7 @@ Enjoy!

 -----

-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
 Software Foundation, Inc.

 Copying and distribution of this file, with or without modification,
diff --git a/THANKS b/THANKS
index a7afaf1..16e2db3 100644
--- a/THANKS
+++ b/THANKS
@@ -410,7 +410,7 @@ coding: utf-8
 End:

 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009 Free Software Foundation, Inc.
+2008, 2009, 2010 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/TODO b/TODO
index 04ca5d8..da5ddfd 100644
--- a/TODO
+++ b/TODO
@@ -592,8 +592,8 @@ with autoconf scripts.

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

-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2007, 2008, 2009
-Free Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2007, 2008,
+2009, 2010 Free Software Foundation, Inc.

 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/bin/Makefile.am b/bin/Makefile.am
index c84f5ae..d6b0563 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,7 +1,7 @@
 # Make Autoconf commands.

 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-# 2009 Free Software Foundation, Inc.
+# 2009, 2010 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/bin/autoconf.as b/bin/autoconf.as
index f81863e..aa7fe6b 100644
--- a/bin/autoconf.as
+++ b/bin/autoconf.as
@@ -4,7 +4,8 @@ m4_divert_push([HEADER-COPYRIGHT])dnl
 # autoconf -- create `configure' using m4 macros

 # Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 2008, 2009, 2010 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/bin/autoheader.in b/bin/autoheader.in
index c3b9c09..ad28252 100644
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -8,8 +8,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S 
"$0" "$@";; esac'
 # autoheader -- create `config.h.in' from `configure.ac'

 # Copyright (C) 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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/bin/autom4te.in b/bin/autom4te.in
index 2e7fc04..e1d40e3 100644
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -6,8 +6,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S 
"$0" "$@";; esac'
     if 0;

 # autom4te - Wrapper around M4 libraries.
-# Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010
+# 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/bin/autoreconf.in b/bin/autoreconf.in
index 9f82071..0fc3bb8 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -7,7 +7,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S 
"$0" "$@";; esac'

 # autoreconf - install the GNU Build System in a directory tree
 # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010 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/bin/autoscan.in b/bin/autoscan.in
index 1e2980f..7623a99 100644
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -4,7 +4,7 @@

 # autoscan - Create configure.scan (a preliminary configure.ac) for a package.
 # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010 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/bin/autoupdate.in b/bin/autoupdate.in
index 2bff59d..353caf9 100644
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -4,7 +4,7 @@

 # autoupdate - modernize an Autoconf file.
 # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010 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/bin/ifnames.in b/bin/ifnames.in
index 17141a4..4e8944a 100644
--- a/bin/ifnames.in
+++ b/bin/ifnames.in
@@ -8,7 +8,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S 
"$0" "$@";; esac'
 # ifnames - print the identifiers used in C preprocessor conditionals

 # Copyright (C) 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2005, 2006,
-# 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010 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/cfg.mk b/cfg.mk
index cd63547..fdf9585 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,6 +1,6 @@
 # Customize maint.mk for Autoconf.            -*- Makefile -*-
-# Copyright (C) 2003, 2004, 2006, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003, 2004, 2006, 2008, 2009, 2010 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/configure.ac b/configure.ac
index 1241264..7ef6bf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,8 @@
 # Process this file with autoconf to produce a configure script.

 # Copyright (C) 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 2008, 2009, 2010 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/doc/Makefile.am b/doc/Makefile.am
index fd1ab33..1634a03 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 # Make Autoconf documentation.

-# Copyright (C) 2000, 2001, 2002, 2003, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2007, 2008, 2009, 2010 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/doc/autoconf.texi b/doc/autoconf.texi
index df4c584..cc19284 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -199,7 +199,7 @@
 templates and an M4 macro package.

 Copyright @copyright{} 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 Foundation, Inc.

 @quotation
diff --git a/doc/install.texi b/doc/install.texi
index 9d885e9..6dd4a57 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -7,7 +7,7 @@
 @unnumbered Installation Instructions

 Copyright @copyright{} 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004,
-2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

 Copying and distribution of this file, with or without modification, are
 permitted in any medium without royalty provided the copyright notice
diff --git a/lib/Autom4te/C4che.pm b/lib/Autom4te/C4che.pm
index a5084f5..e6d13c7 100644
--- a/lib/Autom4te/C4che.pm
+++ b/lib/Autom4te/C4che.pm
@@ -1,5 +1,5 @@
 # autoconf -- create `configure' using m4 macros
-# Copyright (C) 2003, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2009, 2010 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/lib/Autom4te/ChannelDefs.pm b/lib/Autom4te/ChannelDefs.pm
index a863dd3..07f8c8f 100644
--- a/lib/Autom4te/ChannelDefs.pm
+++ b/lib/Autom4te/ChannelDefs.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2002, 2003, 2006, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002, 2003, 2006, 2008, 2009, 2010 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/lib/Autom4te/General.pm b/lib/Autom4te/General.pm
index ed111b9..d113fe9 100644
--- a/lib/Autom4te/General.pm
+++ b/lib/Autom4te/General.pm
@@ -1,6 +1,6 @@
 # autoconf -- create `configure' using m4 macros
-# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2009, 2010 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/lib/Autom4te/Makefile.am b/lib/Autom4te/Makefile.am
index 85667ee..d23dfdb 100644
--- a/lib/Autom4te/Makefile.am
+++ b/lib/Autom4te/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in

-# Copyright (C) 2001, 2003, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2009, 2010 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/lib/Autom4te/Request.pm b/lib/Autom4te/Request.pm
index 20c54e5..32f54ff 100644
--- a/lib/Autom4te/Request.pm
+++ b/lib/Autom4te/Request.pm
@@ -1,5 +1,6 @@
 # autoconf -- create `configure' using m4 macros
-# Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2009, 2010 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/lib/Makefile.am b/lib/Makefile.am
index ab52b66..2d403dc 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 # Make Autoconf-related libraries.

-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010 Free Software
 # Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
diff --git a/lib/autoconf/Makefile.am b/lib/autoconf/Makefile.am
index 698050c..a40ce16 100644
--- a/lib/autoconf/Makefile.am
+++ b/lib/autoconf/Makefile.am
@@ -1,6 +1,7 @@
 # Make Autoconf library.

-# Copyright (C) 2001, 2002, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2006, 2009, 2010 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/lib/autoconf/autoconf.m4 b/lib/autoconf/autoconf.m4
index f345376..33f6019 100644
--- a/lib/autoconf/autoconf.m4
+++ b/lib/autoconf/autoconf.m4
@@ -1,8 +1,8 @@
 # This file is part of Autoconf.                -*- Autoconf -*-
 # Driver that loads the Autoconf macro files.
 #
-# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2006, 2008, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2006, 2008, 2009, 2010
+# Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autoconf/autoheader.m4 b/lib/autoconf/autoheader.m4
index 373623e..920c81f 100644
--- a/lib/autoconf/autoheader.m4
+++ b/lib/autoconf/autoheader.m4
@@ -2,7 +2,7 @@
 # Interface with autoheader.

 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2008, 2009 Free Software Foundation, Inc.
+# 2002, 2008, 2009, 2010 Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autoconf/autoscan.m4 b/lib/autoconf/autoscan.m4
index c15bc81..c3563e7 100644
--- a/lib/autoconf/autoscan.m4
+++ b/lib/autoconf/autoscan.m4
@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Interface with autoscan.

-# Copyright (C) 2002, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2009, 2010 Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autoconf/autotest.m4 b/lib/autoconf/autotest.m4
index 59afc5b..c219a01 100644
--- a/lib/autoconf/autotest.m4
+++ b/lib/autoconf/autotest.m4
@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Interface with Autotest.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2009, 2010 Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autoconf/autoupdate.m4 b/lib/autoconf/autoupdate.m4
index 547a5d4..5d933f8 100644
--- a/lib/autoconf/autoupdate.m4
+++ b/lib/autoconf/autoupdate.m4
@@ -2,7 +2,7 @@
 # Interface with autoupdate.

 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2003, 2004, 2006, 2009 Free Software Foundation, Inc.
+# 2003, 2004, 2006, 2009, 2010 Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 420c8b6..40fdab4 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Programming languages support.
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+# 2010 Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autoconf/erlang.m4 b/lib/autoconf/erlang.m4
index 748fca8..26ecaf4 100644
--- a/lib/autoconf/erlang.m4
+++ b/lib/autoconf/erlang.m4
@@ -1,6 +1,6 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Erlang/OTP language support.
-# Copyright (C) 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2009, 2010 Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index 3239a6e..4cfebe6 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Fortran languages support.
-# Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index 14a8cb9..9d51088 100644
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Checking for functions.
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009 Free Software Foundation, Inc.
+# 2009, 2010 Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 6580e7f..28fd972 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2,8 +2,8 @@
 # Parameterized macros.
 m4_define([_AC_COPYRIGHT_YEARS], [
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+Foundation, Inc.
 ])

 # This file is part of Autoconf.  This program is free
diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index 5c35ab5..e32954b 100644
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -2,7 +2,7 @@
 # Checking for headers.
 #
 # Copyright (C) 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2008,
-# 2009 Free Software Foundation, Inc.
+# 2009, 2010 Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index 1beda24..98ccf5c 100644
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Programming languages support.
-# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009,
+# 2010 Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index e863af4..73edad5 100644
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -1,8 +1,8 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Checking for libraries.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 Free Software
+# Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autoconf/oldnames.m4 b/lib/autoconf/oldnames.m4
index 575ab33..1228b15 100644
--- a/lib/autoconf/oldnames.m4
+++ b/lib/autoconf/oldnames.m4
@@ -1,6 +1,6 @@
 # This file is part of Autoconf.                           -*- Autoconf -*-
 # Support old macros, and provide automated updates.
-# Copyright (C) 1994, 1999, 2000, 2001, 2003, 2009 Free Software
+# Copyright (C) 1994, 1999, 2000, 2001, 2003, 2009, 2010 Free Software
 # Foundation, Inc.

 # This file is part of Autoconf.  This program is free
diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4
index 9e27bf7..3dc7221 100644
--- a/lib/autoconf/programs.m4
+++ b/lib/autoconf/programs.m4
@@ -2,7 +2,7 @@
 # Checking for programs.

 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.

 # This file is part of Autoconf.  This program is free
diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index e95d083..0da742a 100644
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -2,7 +2,7 @@
 # Macros that test for specific, unclassified, features.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.

 # This file is part of Autoconf.  This program is free
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index e921d97..4f4e843 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Parameterizing and creating config.status.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.

 # This file is part of Autoconf.  This program is free
diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
index 3829c4c..0e0e3f3 100644
--- a/lib/autoconf/types.m4
+++ b/lib/autoconf/types.m4
@@ -1,8 +1,8 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Type related macros: existence, sizeof, and structure members.
 #
-# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009,
+# 2010 Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autom4te.in b/lib/autom4te.in
index 39353b4..2bc4f8d 100644
--- a/lib/autom4te.in
+++ b/lib/autom4te.in
@@ -1,7 +1,7 @@
 # Definition of Autom4te option sets.                     -*- Makefile -*-
 #
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+# 2010 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/lib/autoscan/Makefile.am b/lib/autoscan/Makefile.am
index 3517a8d..220f201 100644
--- a/lib/autoscan/Makefile.am
+++ b/lib/autoscan/Makefile.am
@@ -1,6 +1,6 @@
 # Make Autoscan library.

-# Copyright (C) 2001, 2002, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2009, 2010 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/lib/autoscan/autoscan.pre b/lib/autoscan/autoscan.pre
index 56409c8..deb205e 100644
--- a/lib/autoscan/autoscan.pre
+++ b/lib/autoscan/autoscan.pre
@@ -1,6 +1,6 @@
 # autoscan's mapping to Autoconf macros      -*- Makefile -*-
-# Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2009,
+# 2010 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/lib/autotest/Makefile.am b/lib/autotest/Makefile.am
index 6fd297a..c459d87 100644
--- a/lib/autotest/Makefile.am
+++ b/lib/autotest/Makefile.am
@@ -1,6 +1,6 @@
 # Make Autotest library.

-# Copyright (C) 2001, 2002, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2009, 2010 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/lib/autotest/autotest.m4 b/lib/autotest/autotest.m4
index cf7a860..5081ccf 100644
--- a/lib/autotest/autotest.m4
+++ b/lib/autotest/autotest.m4
@@ -1,6 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # M4 macros used in building test suites.
-# Copyright (C) 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2009, 2010 Free Software Foundation,
+# Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 6e43879..71e3090 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1,8 +1,8 @@
 # This file is part of Autoconf.                          -*- Autoconf -*-
 # M4 macros used in building test suites.
 m4_define([_AT_COPYRIGHT_YEARS], [
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+2009, 2010 Free Software Foundation, Inc.
 ])

 # This file is part of Autoconf.  This program is free
diff --git a/lib/autotest/specific.m4 b/lib/autotest/specific.m4
index 4aa30cc..2505fc6 100644
--- a/lib/autotest/specific.m4
+++ b/lib/autotest/specific.m4
@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                          -*- Autoconf -*-
 # M4 macros used in running tests using third-party testing tools.
 m4_define([_AT_COPYRIGHT_YEARS],
-[Copyright (C) 2009 Free Software Foundation, Inc.])
+[Copyright (C) 2009, 2010 Free Software Foundation, Inc.])

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/emacs/autoconf-mode.el b/lib/emacs/autoconf-mode.el
index 5b02e94..a5737f9 100644
--- a/lib/emacs/autoconf-mode.el
+++ b/lib/emacs/autoconf-mode.el
@@ -6,7 +6,7 @@

 ;; This file is part of Autoconf

-;; Copyright (C) 2001, 2006, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2006, 2009, 2010 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/lib/emacs/autotest-mode.el b/lib/emacs/autotest-mode.el
index d376f74..269db85 100644
--- a/lib/emacs/autotest-mode.el
+++ b/lib/emacs/autotest-mode.el
@@ -5,7 +5,7 @@

 ;; This file is part of Autoconf

-;; Copyright (C) 2001, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2009, 2010 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/lib/freeze.mk b/lib/freeze.mk
index 977c7b9..fdd07f2 100644
--- a/lib/freeze.mk
+++ b/lib/freeze.mk
@@ -1,6 +1,6 @@
 # Freeze M4 files.

-# Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009 Free Software
+# Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
diff --git a/lib/m4sugar/Makefile.am b/lib/m4sugar/Makefile.am
index 5458ef4..dcfa5d5 100644
--- a/lib/m4sugar/Makefile.am
+++ b/lib/m4sugar/Makefile.am
@@ -1,6 +1,6 @@
 # Make Autoconf library for M4sugar.

-# Copyright (C) 2001, 2002, 2006, 2007, 2008, 2009 Free Software
+# Copyright (C) 2001, 2002, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
diff --git a/lib/m4sugar/foreach.m4 b/lib/m4sugar/foreach.m4
index 6dc6e79..0109abf 100644
--- a/lib/m4sugar/foreach.m4
+++ b/lib/m4sugar/foreach.m4
@@ -4,7 +4,7 @@
 # Speeds up GNU M4 1.4.x by avoiding quadratic $@ recursion, but penalizes
 # GNU M4 1.6 by requiring more memory and macro expansions.
 #
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 436474f..8160b3d 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -3,7 +3,7 @@
 # Requires GNU M4 and M4sugar.
 #
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009 Free Software Foundation, Inc.
+# 2009, 2010 Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index cfdef72..a9dd09a 100644
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
@@ -4,7 +4,7 @@ divert(-1)#                                                  
-*- Autoconf -*-
 # Requires GNU M4.
 #
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010 Free Software Foundation, Inc.

 # This file is part of Autoconf.  This program is free
 # software; you can redistribute it and/or modify it under the
diff --git a/m4/m4.m4 b/m4/m4.m4
index c6b64b0..a512736 100644
--- a/m4/m4.m4
+++ b/m4/m4.m4
@@ -1,7 +1,7 @@
 # m4.m4 serial 10

-# Copyright (C) 2000, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.

 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/m4/make-case.m4 b/m4/make-case.m4
index 717e6de..f818d92 100644
--- a/m4/make-case.m4
+++ b/m4/make-case.m4
@@ -1,6 +1,6 @@
 # make-case.m4 serial 1

-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.

 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the notice and
diff --git a/maint.mk b/maint.mk
index 09d1de3..119a52a 100644
--- a/maint.mk
+++ b/maint.mk
@@ -2,8 +2,8 @@
 # This Makefile fragment tries to be general-purpose enough to be
 # used by at least coreutils, idutils, CPPI, Bison, and Autoconf.

-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-## Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+## 2010 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/man/Makefile.am b/man/Makefile.am
index 2df4428..aa27511 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,7 +1,7 @@
 # Make Autoconf man pages.

-# Copyright (C) 2001, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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/tests/Makefile.am b/tests/Makefile.am
index 085c9d1..669e603 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
 ## Make Autoconf tests.

 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009 Free Software Foundation, Inc.
+# 2009, 2010 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/tests/atlocal.in b/tests/atlocal.in
index 96f3831..ae61fd5 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -2,8 +2,8 @@
 # @configure_input@
 # Configurable variable values for Autoconf test suite.

-# Copyright (C) 2000, 2001, 2005, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000, 2001, 2005, 2008, 2009, 2010 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/tests/autoscan.at b/tests/autoscan.at
index 8839238..a98f025 100644
--- a/tests/autoscan.at
+++ b/tests/autoscan.at
@@ -2,7 +2,7 @@

 AT_BANNER([Autoscan.])

-# Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2009, 2010 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/tests/autotest.at b/tests/autotest.at
index b95d9ee..8a08897 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -2,7 +2,7 @@

 AT_BANNER([Autotest.])

-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/tests/base.at b/tests/base.at
index a8f8de7..5ce3e89 100644
--- a/tests/base.at
+++ b/tests/base.at
@@ -2,8 +2,8 @@

 AT_BANNER([Autoconf base layer.])

-# Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009, 2010
+# 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/tests/c.at b/tests/c.at
index 34f83ae..8e77233 100644
--- a/tests/c.at
+++ b/tests/c.at
@@ -2,8 +2,8 @@

 AT_BANNER([C low level compiling/preprocessing macros.])

-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009,
+# 2010 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/tests/compile.at b/tests/compile.at
index 49cd6cb..bace001 100644
--- a/tests/compile.at
+++ b/tests/compile.at
@@ -2,8 +2,8 @@

 AT_BANNER([Low level compiling/preprocessing macros.])

-# Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009, 2010
+# 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/tests/erlang.at b/tests/erlang.at
index 3402380..ed95a3b 100644
--- a/tests/erlang.at
+++ b/tests/erlang.at
@@ -2,7 +2,7 @@

 AT_BANNER([Erlang low level compiling and utility macros.])

-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010 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/tests/foreign.at b/tests/foreign.at
index feb280f..18aef31 100644
--- a/tests/foreign.at
+++ b/tests/foreign.at
@@ -2,8 +2,8 @@

 AT_BANNER([Compatibility with other tools.])

-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009,
+# 2010 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/tests/fortran.at b/tests/fortran.at
index d511e3d..73692d4 100644
--- a/tests/fortran.at
+++ b/tests/fortran.at
@@ -2,8 +2,8 @@

 AT_BANNER([Fortran low level compiling/preprocessing macros.])

-# Copyright (C) 2000, 2001, 2003, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000, 2001, 2003, 2008, 2009, 2010 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/tests/local.at b/tests/local.at
index 37ed3ea..58a9069 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -1,7 +1,7 @@
 # M4 macros used in building Autoconf test suites.        -*- Autotest -*-

 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009 Free Software Foundation, Inc.
+# 2009, 2010 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/tests/m4sh.at b/tests/m4sh.at
index ab623b4..f34e6ba 100644
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -3,7 +3,7 @@
 AT_BANNER([M4sh.])

 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009 Free Software Foundation, Inc.
+# 2009, 2010 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/tests/m4sugar.at b/tests/m4sugar.at
index 4d937cf..c2ef326 100644
--- a/tests/m4sugar.at
+++ b/tests/m4sugar.at
@@ -2,8 +2,8 @@

 AT_BANNER([M4sugar.])

-# Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007, 2008, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007, 2008, 2009, 2010
+# 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/tests/mktests.sh b/tests/mktests.sh
index 9897599..68667e4 100755
--- a/tests/mktests.sh
+++ b/tests/mktests.sh
@@ -3,7 +3,7 @@
 # Build some of the Autoconf test files.

 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009 Free Software Foundation, Inc.
+# 2009, 2010 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/tests/semantics.at b/tests/semantics.at
index 596c1cd..9aaffc3 100644
--- a/tests/semantics.at
+++ b/tests/semantics.at
@@ -2,8 +2,8 @@

 AT_BANNER([Semantics.])

-# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2009, 2010
+# 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/tests/statesave.m4 b/tests/statesave.m4
index 26640af..06d1361 100644
--- a/tests/statesave.m4
+++ b/tests/statesave.m4
@@ -1,7 +1,7 @@
 # statesave.m4 serial 2

 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009 Free Software Foundation, Inc.
+# 2009, 2010 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/tests/suite.at b/tests/suite.at
index b4d1dc2..3f0ce42 100644
--- a/tests/suite.at
+++ b/tests/suite.at
@@ -1,6 +1,6 @@
 # Validation suite for Autoconf                           -*- Autotest -*-

-# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2009 Free Software
+# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2009, 2010 Free Software
 # Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/tests/tools.at b/tests/tools.at
index aa3f258..73757d7 100644
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -2,8 +2,8 @@

 AT_BANNER([Executables (autoheader, autoupdate...).])

-# Copyright (C) 2000, 2001, 2003, 2004, 2006, 2007, 2008, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2004, 2006, 2007, 2008, 2009, 2010
+# 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/tests/torture.at b/tests/torture.at
index 6fdf7e7..f00498f 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,7 +1,7 @@
 #                                                      -*- Autotest -*-

 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-# 2009 Free Software Foundation, Inc.
+# 2009, 2010 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/tests/wrapper.as b/tests/wrapper.as
index 1c45bbb..f4fad26 100644
--- a/tests/wrapper.as
+++ b/tests/wrapper.as
@@ -1,7 +1,8 @@
 AS_INIT[]dnl                                            -*- shell-script -*-
 # wrapper.as -- running address@hidden@' as if it were installed.
 # @configure_input@
-# Copyright (C) 2003, 2004, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2007, 2009, 2010 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
-- 
1.6.4.2


From 2b43774de1174002de49f9339e75de807bba85c6 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 5 Jan 2010 21:13:38 -0700
Subject: [PATCH 2/3] Update upstream files.

* GNUmakefile: Update via 'make fetch'.
* build-aux/announce-gen: Likewise.
* build-aux/config.guess: Likewise.
* build-aux/config.sub: Likewise.
* build-aux/gendocs.sh: Likewise.
* build-aux/gnupload: Likewise.
* build-aux/move-if-change: Likewise.
* build-aux/update-copyright: Likewise.
* build-aux/vc-list-files: Likewise.
* doc/standards.texi: Likewise.
* cfg.mk (update-copyright-env): Enforce wrap column.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog                  |   13 ++++++++++
 GNUmakefile                |    2 +-
 build-aux/announce-gen     |    2 +-
 build-aux/config.guess     |   12 ++++++---
 build-aux/config.sub       |   18 ++++++++++-----
 build-aux/gendocs.sh       |    8 +++---
 build-aux/gnupload         |   53 +++++++++++++++++++++----------------------
 build-aux/move-if-change   |    2 +-
 build-aux/update-copyright |   11 ++++++--
 build-aux/vc-list-files    |    2 +-
 cfg.mk                     |    4 ++-
 doc/standards.texi         |   35 ++++++++++++++++++++---------
 12 files changed, 102 insertions(+), 60 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e20e00..de8101f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2010-01-05  Eric Blake  <address@hidden>

+       Update upstream files.
+       * GNUmakefile: Update via 'make fetch'.
+       * build-aux/announce-gen: Likewise.
+       * build-aux/config.guess: Likewise.
+       * build-aux/config.sub: Likewise.
+       * build-aux/gendocs.sh: Likewise.
+       * build-aux/gnupload: Likewise.
+       * build-aux/move-if-change: Likewise.
+       * build-aux/update-copyright: Likewise.
+       * build-aux/vc-list-files: Likewise.
+       * doc/standards.texi: Likewise.
+       * cfg.mk (update-copyright-env): Enforce wrap column.
+
        Update copyright year.
        All files changed to add 2010, via 'make update-copyright'.

diff --git a/GNUmakefile b/GNUmakefile
index 33eb3aa..40ccc06 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -5,7 +5,7 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.

-# Copyright (C) 2001, 2003, 2006-2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2006-2010 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/build-aux/announce-gen b/build-aux/announce-gen
index 5fbb9cd..7d70fd4 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -9,7 +9,7 @@ my $VERSION = '2009-11-20 13:36'; # UTC
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.

-# Copyright (C) 2002-2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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/build-aux/config.guess b/build-aux/config.guess
index d53e309..c2246a4 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.

-timestamp='2009-11-19'
+timestamp='2009-12-30'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,9 @@ version="\
 GNU config.guess ($timestamp)

 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
@@ -333,6 +334,9 @@ case 
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+       echo i386-pc-auroraux${UNAME_RELEASE}
+       exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
        eval $set_cc_for_build
        SUN_ARCH="i386"
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 17c9145..8518609 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.

-timestamp='2009-11-07'
+timestamp='2009-12-31'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -75,8 +75,9 @@ Report bugs and patches to <address@hidden>."
 version="\
 GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
@@ -1256,6 +1257,9 @@ case $os in
         # First match some system type aliases
         # that might get confused with valid system types.
        # -solaris* is a basic system type, with this one exception.
+        -auroraux)
+               os=-auroraux
+               ;;
        -solaris1 | -solaris1.*)
                os=`echo $os | sed -e 's|solaris1|sunos4|'`
                ;;
@@ -1277,8 +1281,8 @@ case $os in
        # -sysv* is not here because it comes later, after sysvr4.
        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | 
-sunos[34]*\
-             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-             | -kopensolaris* \
+             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | 
-solaris* \
+             | -sym* | -kopensolaris* \
              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
              | -aos* | -aros* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1432,6 +1436,8 @@ case $os in
        -dicos*)
                os=-dicos
                ;;
+        -nacl*)
+               ;;
        -none)
                ;;
        *)
diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index 992d9fc..b50a6c7 100755
--- a/build-aux/gendocs.sh
+++ b/build-aux/gendocs.sh
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/sh -e
 # gendocs.sh -- generate a GNU manual in many formats.  This script is
 #   mentioned in maintain.texi.  See the help message below for usage details.

-scriptversion=2009-09-09.22
+scriptversion=2010-01-02.16

-# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 # Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -268,7 +268,7 @@ else
 fi

 echo Making .tar.gz for sources...
-srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null`
+srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null` || true
 tar cvzfh $outdir/$PACKAGE.texi.tar.gz $srcfiles
 texi_tgz_size=`calcsize $outdir/$PACKAGE.texi.tar.gz`

diff --git a/build-aux/gnupload b/build-aux/gnupload
index 8320b58..bd120e8 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Sign files and upload them.

-scriptversion=2009-04-28.21; # UTC
+scriptversion=2009-12-21.21; # UTC

 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation
 #
@@ -73,34 +73,33 @@ actual command line options.  Use this to keep your 
defaults.  Comments
 (#) and empty lines in $conffile are allowed.

 Examples:
-1. Upload automake-1.8.2b.tar.gz and automake-1.8.2b.tar.bz2 to two sites:
-  gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           --to alpha.gnu.org:automake \\
-           automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
-
-2. Same as above, but also create symbolic links to automake-latest.tar.*:
-  gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           --to alpha.gnu.org:automake \\
-           --symlink-regex \\
-           automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
-
-3. Symlink automake-1.8.2b.tar.gz to automake-latest.tar.gz and
-automake-1.8.2b.tar.bz2 to automake-latest.tar.bz2 on both sites:
+1. Upload foobar-1.0.tar.gz to ftp.gnu.org:
+  gnupload --to ftp.gnu.org:foobar foobar-1.0.tar.gz

-  gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           --to alpha.gnu.org:automake \\
-           --symlink automake-1.8.2b.tar.gz automake-latest.tar.gz \\
-                     automake-1.8.2b.tar.bz2 automake-latest.tar.bz2
+2. Upload foobar-1.0.tar.gz and foobar-1.0.tar.xz to ftp.gnu.org:
+  gnupload --to ftp.gnu.org:foobar foobar-1.0.tar.gz foobar-1.0.tar.xz

-4. Delete automake-1.8.2a.tar.gz and .bz2, remove symlink
-automake-latest.tar.gz and upload automake-1.8.2b.tar.gz:
-
-  gnupload --to sources.redhat.com:~ftp/pub/automake \\
-           --to alpha.gnu.org:automake \\
-           --delete automake-1.8.2a.tar.gz automake-1.8.2a.tar.bz2 \\
-           --rmsymlink automake-latest.tar.gz \\
-           -- \\
-           automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
+3. Same as above, and also create symbolic links to foobar-latest.tar.*:
+  gnupload --to ftp.gnu.org:foobar \\
+           --symlink-regex \\
+           foobar-1.0.tar.gz foobar-1.0.tar.xz
+
+4. Upload foobar-0.9.90.tar.gz to two sites:
+  gnupload --to alpha.gnu.org:foobar \\
+           --to sources.redhat.com:~ftp/pub/foobar \\
+           foobar-0.9.90.tar.gz
+
+5. Delete oopsbar-0.9.91.tar.gz and upload foobar-0.9.91.tar.gz
+   (the -- terminates the list of files to delete):
+  gnupload --to alpha.gnu.org:foobar \\
+           --to sources.redhat.com:~ftp/pub/foobar \\
+           --delete oopsbar-0.9.91.tar.gz \\
+           -- foobar-0.9.91.tar.gz
+
+gnupload uses the ncftpput program to do the transfers; if you don't
+happen to have an ncftp package installed, the ncftpput-ftp script in
+the build-aux/ directory of the gnulib package
+(http://savannah.gnu.org/projects/gnulib) may serve as a replacement.

 Report bugs to <address@hidden>.
 Send patches to <address@hidden>."
diff --git a/build-aux/move-if-change b/build-aux/move-if-change
index a542417..9215c89 100755
--- a/build-aux/move-if-change
+++ b/build-aux/move-if-change
@@ -8,7 +8,7 @@ VERSION='2007-09-28 23:10'; # UTC
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.

-# Copyright (C) 2002-2007 Free Software Foundation, Inc.
+# Copyright (C) 2002-2007, 2009-2010 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/build-aux/update-copyright b/build-aux/update-copyright
index f541761..28ff441 100755
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -3,9 +3,9 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" 
${1+"$@"}'
     if 0;
 # Update an FSF copyright year list to include the current year.

-my $VERSION = '2009-10-30.15:57'; # UTC
+my $VERSION = '2009-12-28.11:09'; # UTC

-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009-2010 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
@@ -114,6 +114,8 @@ my $VERSION = '2009-10-30.15:57'; # UTC
 #      are expanded instead.
 #   3. For testing purposes, you can set the assumed current year in
 #      UPDATE_COPYRIGHT_YEAR.
+#   4. The default maximum line length for a copyright line is 72.
+#      Set UPDATE_COPYRIGHT_MAX_LINE_LENGTH to use a different length.

 use strict;
 use warnings;
@@ -122,7 +124,10 @@ my $copyright_re = 'Copyright';
 my $circle_c_re = '(?:\([cC]\)|@copyright{}|&copy;)';
 my $holder = 'Free Software Foundation, Inc.';
 my $prefix_max = 5;
-my $margin = 72;
+my $margin = $ENV{UPDATE_COPYRIGHT_MAX_LINE_LENGTH};
+!$margin || $margin !~ m/^\d+$/
+  and $margin = 72;
+
 my $tab_width = 8;

 my $this_year = $ENV{UPDATE_COPYRIGHT_YEAR};
diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files
index cc716e9..c07576d 100755
--- a/build-aux/vc-list-files
+++ b/build-aux/vc-list-files
@@ -4,7 +4,7 @@
 # Print a version string.
 scriptversion=2009-07-21.16; # UTC

-# Copyright (C) 2006-2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2010 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/cfg.mk b/cfg.mk
index fdf9585..7b1eb93 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -97,4 +97,6 @@ local-checks-to-skip ?= \
   changelog-check sc_unmarked_diagnostics

 # Always use longhand copyrights.
-update-copyright-env = UPDATE_COPYRIGHT_USE_INTERVALS=0
+update-copyright-env = \
+  UPDATE_COPYRIGHT_USE_INTERVALS=0 \
+  UPDATE_COPYRIGHT_MAX_LINE_LENGTH=72
diff --git a/doc/standards.texi b/doc/standards.texi
index 5b56541..cbf2f84 100644
--- a/doc/standards.texi
+++ b/doc/standards.texi
@@ -3,7 +3,7 @@
 @setfilename standards.info
 @settitle GNU Coding Standards
 @c This date is automagically updated when you save this file:
address@hidden lastupdate September 14, 2009
address@hidden lastupdate December 11, 2009
 @c %**end of header

 @dircategory GNU organization
@@ -81,9 +81,6 @@ Preface
 even if you write in another programming language.  The rules often
 state reasons for writing in a certain way.

-This release of the GNU Coding Standards was last updated
address@hidden
-
 @cindex where to obtain @code{standards.texi}
 @cindex downloading this manual
 If you did not obtain this file directly from the GNU project and
@@ -92,6 +89,18 @@ Preface
 different formats, including the Texinfo source, PDF, HTML, DVI, plain
 text, and more, at: @uref{http://www.gnu.org/prep/standards/}.

+If you are maintaining an official GNU package, in addition to this
+document, please read and follow the GNU maintainer information
+(@pxref{Top, , Contents, maintain, Information for Maintainers of GNU
+Software}).
+
address@hidden @code{gnustandards-commit@@gnu.org} mailing list
+If you want to receive diffs for every change to these GNU documents,
+join the mailing list @code{gnustandards-commit@@gnu.org}, via the web
+interface at
address@hidden://lists.gnu.org/mailman/listinfo/gnustandards-commit}.
+Archives are also available there.
+
 Corrections or suggestions for this document should be sent to
 @email{bug-standards@@gnu.org}.  If you make a suggestion, please include a
 suggested new wording for it; our time is limited.  We prefer a context
@@ -114,6 +123,10 @@ Preface
 coding standards for a trivial program.
 @uref{http://www.gnu.org/software/hello/hello.html}.

+This release of the GNU Coding Standards was last updated
address@hidden
+
+
 @node Legal Issues
 @chapter Keeping Free Software Free
 @cindex legal aspects
@@ -4051,13 +4064,13 @@ Releases
 distribution.  So if you do distribute non-source files, always make
 sure they are up to date when you make a new distribution.

-Make sure that the directory into which the distribution unpacks (as
-well as any subdirectories) are all world-writable (octal mode 777).
-This is so that old versions of @code{tar} which preserve the
-ownership and permissions of the files from the tar archive will be
-able to extract all the files even if the user is unprivileged.
-
-Make sure that all the files in the distribution are world-readable.
+Make sure that all the files in the distribution are world-readable, and
+that directories are world-readable and world-searchable (octal mode 755).
+We used to recommend that all directories in the distribution also be
+world-writable (octal mode 777), because ancient versions of @code{tar}
+would otherwise not cope when extracting the archive as an unprivileged
+user.  That can easily lead to security issues when creating the archive,
+however, so now we recommend against that.

 Don't include any symbolic links in the distribution itself.  If the tar
 file contains symbolic links, then people cannot even unpack it on
-- 
1.6.4.2


From acf0439102e956cf2ec30005a560bd1192663119 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 5 Jan 2010 21:31:32 -0700
Subject: [PATCH 3/3] Improve release automation.

* maint.mk (gnulib_dir, gnulib-version, bootstrap-tools)
(announcement): Copy from latest gnulib maint.mk.
* cfg.mk (announce_gen, gpg_key_ID): Delete.
(bootstrap-tools): Override the default.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog |    6 ++++++
 cfg.mk    |   11 ++++-------
 maint.mk  |   18 ++++++++++++++++--
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de8101f..2765bda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-05  Eric Blake  <address@hidden>

+       Improve release automation.
+       * maint.mk (gnulib_dir, gnulib-version, bootstrap-tools)
+       (announcement): Copy from latest gnulib maint.mk.
+       * cfg.mk (announce_gen, gpg_key_ID): Delete.
+       (bootstrap-tools): Override the default.
+
        Update upstream files.
        * GNUmakefile: Update via 'make fetch'.
        * build-aux/announce-gen: Likewise.
diff --git a/cfg.mk b/cfg.mk
index 7b1eb93..4bdf97f 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -23,19 +23,16 @@ export PATH = $(shell echo "`pwd`/tests:$$PATH")
 # Remove the autoreconf-provided INSTALL, so that we regenerate it.
 _autoreconf = autoreconf -i -v && rm -f INSTALL

-# Version management.
-announce_gen   = $(srcdir)/build-aux/announce-gen
-
 # Used in maint.mk's web-manual rule
 manual_title = Creating Automatic Configuration Scripts

-# The GnuPG ID of the key used to sign the tarballs.
-gpg_key_ID = F4850180
-
 # The local directory containing the checked-out copy of gnulib used in this
-# release.
+# release (override the default).
 gnulib_dir = '$(abs_srcdir)'/../gnulib

+# The bootstrap tools (override the default).
+bootstrap-tools = automake
+
 # Update files from gnulib.
 .PHONY: fetch gnulib-update autom4te-update
 fetch: gnulib-update autom4te-update
diff --git a/maint.mk b/maint.mk
index 119a52a..7696c96 100644
--- a/maint.mk
+++ b/maint.mk
@@ -546,15 +546,29 @@ my-distcheck: $(local-check) 
$(release_archive_dir)/$(prev-tgz)
 prev-tgz = $(PACKAGE)-$(PREV_VERSION).tar.gz

 rel-files = $(DIST_ARCHIVES)
+
+gnulib_dir ?= $(srcdir)/gnulib
+gnulib-version = $$(cd $(gnulib_dir) && git describe)
+bootstrap-tools ?= autoconf,automake,gnulib
+
+# If it's not already specified, derive the GPG key ID from
+# the signed tag we've just applied to mark this release.
+gpg_key_ID ?= \
+  $$(git cat-file tag v$(VERSION) > .ann-sig \
+     && gpgv .ann-sig - < /dev/null 2>&1 \
+         | sed -n '/.*key ID \([0-9A-F]*\)/s//\1/p'; rm -f .ann-sig)
+
 announcement: NEWS ChangeLog $(rel-files)
-       @$(announce_gen)                                                \
+       @$(build_aux)/announce_gen                                      \
            --release-type=$(RELEASE_TYPE)                              \
            --package=$(PACKAGE)                                        \
            --prev=$(PREV_VERSION)                                      \
            --curr=$(VERSION)                                           \
            --gpg-key-id=$(gpg_key_ID)                                  \
            --news=$(srcdir)/NEWS                                       \
-           --bootstrap-tools=automake                                  \
+           --bootstrap-tools=$(bootstrap-tools)                        \
+           --gnulib-version=$(gnulib-version)                          \
+           --no-print-checksums                                        \
            $(addprefix --url-dir=, $(url_dir_list))

 ## ---------------- ##
-- 
1.6.4.2

Attachment: signature.asc
Description: OpenPGP digital signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]