Re: update copyright

[Eric Blake]

Eric Blake <ebb9 <at> byu.net> writes:

> Now that the GNU Coding Standards recommend bulk updating of copyright
> years, and gnulib has a tool for making this easy, I'm installing the
> following:

And somehow I botched this part:

> +# Don't adjust copyright in upstream files.
> +update-copyright-exclude-regexp = \
> +(^|/)(COPYING|build-aux/|GNUmakefile\
> +|Autom4te/(Configure_ac|Channels|FileUtils|Struct|XFile)\
> +|doc/(fdl|gendocs|gnu-oids|make-stds|standards)).*$$

by still ending up changing copyright on upstream files in lib/Autom4te.  So 
I'll be checking in this followup:


From: Eric Blake <address@hidden>
Date: Fri, 14 Aug 2009 09:09:26 -0600
Subject: [PATCH] Fix copyright updating.

* cfg.mk (update-copyright-exclude-regexp): Delete.
* .x-update-copyright: New file.
* lib/Autom4te/Makefile.am: Add copyright.
* lib/Autom4te/Channels.pm: Revert copyright update to upstream
file.
* lib/Autom4te/Configure_ac.pm: Likewise.
* lib/Autom4te/FileUtils.pm: Likewise.
* lib/Autom4te/Struct.pm: Likewise.
* lib/Autom4te/XFile.pm: Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog                    |   13 ++++++++++++-
 cfg.mk                       |    6 ------
 lib/Autom4te/Channels.pm     |    3 +--
 lib/Autom4te/Configure_ac.pm |    3 +--
 lib/Autom4te/FileUtils.pm    |    3 +--
 lib/Autom4te/Makefile.am     |   15 +++++++++++++++
 lib/Autom4te/Struct.pm       |    3 +--
 7 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3baf7a6..c03f51f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-08-14  Eric Blake  <address@hidden>

+       Fix copyright updating.
+       * cfg.mk (update-copyright-exclude-regexp): Delete.
+       * .x-update-copyright: New file.
+       * lib/Autom4te/Makefile.am: Add copyright.
+       * lib/Autom4te/Channels.pm: Revert copyright update to upstream
+       file.
+       * lib/Autom4te/Configure_ac.pm: Likewise.
+       * lib/Autom4te/FileUtils.pm: Likewise.
+       * lib/Autom4te/Struct.pm: Likewise.
+       * lib/Autom4te/XFile.pm: Likewise.
+
        Update copyright.
        * AUTHORS: Include 2009 in copyright.
        * lib/Autom4te/C4che.pm: Likewise.
@@ -38,7 +49,7 @@
        Prepare to bulk update copyright years.
        * build-aux/update-copyright: New file.
        * cfg.mk (gnulib-update): Sync it from gnulib.
-       (update-copyright-exclude-regexp): New varialbe.
+       (update-copyright-exclude-regexp): New variable.
        (web-manual): Move...
        * maint.mk (web-manual): ...here, to match gnulib.
        (update-copyright): New target, copied from gnulib's
diff --git a/cfg.mk b/cfg.mk
index deb8c69..25b1bc5 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -108,9 +108,3 @@ autom4te-update:
 # Tests not to run.
 local-checks-to-skip ?= \
   changelog-check sc_unmarked_diagnostics
-
-# Don't adjust copyright in upstream files.
-update-copyright-exclude-regexp = \
-(^|/)(COPYING|build-aux/|GNUmakefile\
-|Autom4te/(Configure_ac|Channels|FileUtils|Struct|XFile)\
-|doc/(fdl|gendocs|gnu-oids|make-stds|standards)).*$$
diff --git a/lib/Autom4te/Channels.pm b/lib/Autom4te/Channels.pm
index 86723ee..1309d20 100644
--- a/lib/Autom4te/Channels.pm
+++ b/lib/Autom4te/Channels.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2002, 2004, 2006, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002, 2004, 2006, 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
diff --git a/lib/Autom4te/Configure_ac.pm b/lib/Autom4te/Configure_ac.pm
index fe39bc7..5ff8d57 100644
--- a/lib/Autom4te/Configure_ac.pm
+++ b/lib/Autom4te/Configure_ac.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2003, 2005, 2006, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003, 2005, 2006  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/FileUtils.pm b/lib/Autom4te/FileUtils.pm
index c12498a..63420f6 100644
--- a/lib/Autom4te/FileUtils.pm
+++ b/lib/Autom4te/FileUtils.pm
@@ -1,5 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 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
diff --git a/lib/Autom4te/Makefile.am b/lib/Autom4te/Makefile.am
index 6832150..85667ee 100644
--- a/lib/Autom4te/Makefile.am
+++ b/lib/Autom4te/Makefile.am
@@ -1,5 +1,20 @@
 ## Process this file with automake to create Makefile.in

+# Copyright (C) 2001, 2003, 2009 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 perllibdir = $(pkgdatadir)/Autom4te
 dist_perllib_DATA = \
   C4che.pm \
diff --git a/lib/Autom4te/Struct.pm b/lib/Autom4te/Struct.pm
index 9b511fd..73c25dd 100644
--- a/lib/Autom4te/Struct.pm
+++ b/lib/Autom4te/Struct.pm
@@ -1,6 +1,5 @@
 # autoconf -- create `configure' using m4 macros
-# Copyright (C) 2001, 2002, 2006, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2006 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.3.2