update copyright year

Eric Blake <[email protected]> Mon, 17 Aug 2009 06:05:01 -0600

Newsgroups	gmane.comp.gnu.m4.patches
Message-ID	<[email protected]>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I'm installing this, which normalizes the copyright year to 2009 as now
recommended by GNU Coding Standards.

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

Eric Blake             [email protected]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkqJR20ACgkQ84KuGfSFAYB3ngCcCxW1qwj8K44vxtoZRqxsplEf
aNYAniGSDD0aDZ2nCvS+yOAZEgr7zQdr
=vAiC
-----END PGP SIGNATURE-----

_______________________________________________
M4-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/m4-patches

m4.patch431 (text/plain, 17.1 KB)

From 548145f74620c9deb456c9eec3f20e18968d4da7 Mon Sep 17 00:00:00 2001
From: Eric Blake <[email protected]>
Date: Fri, 14 Aug 2009 15:14:12 -0600
Subject: [PATCH 1/2] Prepare to bulk update copyright year.

* gnulib: Update.
* m4/gnulib-cache.m4: Import update-copyright and vc-list-files
modules.
* maint.mk: Fix copyright.
(build_aux, VC_LIST, VC_LIST_EXCEPT, update-copyright): New macros
and rules borrowed from gnulib.
* cfg.mk (update-copyright-env): Enforce longhand behavior.
* .cvsignore: Reflect these changes.
* .gitignore: Likewise.
* .x-update-copyright: New file.

Signed-off-by: Eric Blake <[email protected]>
---
 .x-update-copyright  |    1 +
 ChangeLog            |   14 ++++++++++++++
 build-aux/.cvsignore |    2 ++
 build-aux/.gitignore |    2 ++
 cfg.mk               |    3 +++
 gnulib               |    2 +-
 m4/gnulib-cache.m4   |    4 +++-
 maint.mk             |   27 ++++++++++++++++++++++++++-
 8 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 .x-update-copyright

diff --git a/.x-update-copyright b/.x-update-copyright
new file mode 100644
index 0000000..725ba40
--- /dev/null
+++ b/.x-update-copyright
@@ -0,0 +1 @@
+m4/gnulib-cache.m4
diff --git a/ChangeLog b/ChangeLog
index c0379e9..052f019 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-08-17  Eric Blake  <[email protected]>
+
+	Prepare to bulk update copyright year.
+	* gnulib: Update.
+	* m4/gnulib-cache.m4: Import update-copyright and vc-list-files
+	modules.
+	* maint.mk: Fix copyright.
+	(build_aux, VC_LIST, VC_LIST_EXCEPT, update-copyright): New macros
+	and rules borrowed from gnulib.
+	* cfg.mk (update-copyright-env): Enforce longhand behavior.
+	* .cvsignore: Reflect these changes.
+	* .gitignore: Likewise.
+	* .x-update-copyright: New file.
+
 2009-08-14  Eric Blake  <[email protected]>

 	Explicitly request GNU getopt extensions.
diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
index 8196f1a..8390c93 100644
--- a/build-aux/.cvsignore
+++ b/build-aux/.cvsignore
@@ -4,3 +4,5 @@ gendocs.sh
 git-version-gen
 gnupload
 link-warning.h
+update-copyright
+vc-list-files
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index b82803d..b88d40c 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -4,3 +4,5 @@
 /git-version-gen
 /gnupload
 /link-warning.h
+/update-copyright
+/vc-list-files
diff --git a/cfg.mk b/cfg.mk
index 3dda9f6..9db2583 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -39,3 +39,6 @@ local-checks-to-skip = changelog-check
 # The local directory containing the checked-out copy of gnulib used in this
 # release.  Used solely to get gnulib's SHA1 for the "announcement" target.
 gnulib_dir = $(srcdir)/gnulib
+
+# Always use longhand copyrights.
+update-copyright-env = UPDATE_COPYRIGHT_USE_INTERVALS=0
diff --git a/gnulib b/gnulib
index 2f5181b..077d9af 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 2f5181b1a247323cb2a4a4c6165997674866bb20
+Subproject commit 077d9afeabe70728bec79f7ea9eff0264a7fccdc
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index c808284..b3bbb7d 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@


 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --avoid=lock-tests --avoid=tls-tests --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec close-stream closein config-h dirname error execute fdl-1.3 fflush filenamecat fopen fopen-safer fseeko gendocs getopt-gnu git-version-gen gnumakefile gnupload gpl-3.0 intprops memchr2 mkstemp obstack pipe progname regex sigaction stdbool stdint stdlib-safer strsignal strstr strtod strtol unlocked-io verror version-etc version-etc-fsf wait-process xalloc xprintf xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --avoid=lock-tests --avoid=tls-tests --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec close-stream closein config-h dirname error execute fdl-1.3 fflush filenamecat fopen fopen-safer fseeko gendocs getopt-gnu git-version-gen gnumakefile gnupload gpl-3.0 intprops memchr2 mkstemp obstack pipe progname regex sigaction stdbool stdint stdlib-safer strsignal strstr strtod strtol unlocked-io update-copyright vc-list-files verror version-etc version-etc-fsf wait-process xalloc xprintf xvasprintf-posix

 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
@@ -62,6 +62,8 @@ gl_MODULES([
   strtod
   strtol
   unlocked-io
+  update-copyright
+  vc-list-files
   verror
   version-etc
   version-etc-fsf
diff --git a/maint.mk b/maint.mk
index 5b3f7cc..a50c727 100644
--- a/maint.mk
+++ b/maint.mk
@@ -1,7 +1,7 @@
 ## maint.mk -- Makefile rules for m4 maintainers -*-Makefile-*-
 ##
 ## Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-## Foundation
+## Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
@@ -22,6 +22,9 @@
 # ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
 ME := maint.mk

+# Override this in cfg.mk if you use a non-standard build-aux directory.
+build_aux ?= $(srcdir)/build-aux
+
 # Do not save the original name or timestamp in the .tar.gz file.
 # Use --rsyncable if available.
 gzip_rsyncable := \
@@ -32,6 +35,11 @@ GIT = git
 VC = $(GIT)
 VC-tag = git tag -s -m '$(VERSION)' -u $(gpg_key_ID)

+VC_LIST = $(build_aux)/vc-list-files -C $(srcdir)
+
+VC_LIST_EXCEPT = \
+  $(VC_LIST) | if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; else grep -v ChangeLog; fi
+
 VERSION_REGEXP = $(subst .,\.,$(VERSION))
 my_distdir = $(PACKAGE)-$(VERSION)

@@ -198,3 +206,20 @@ web-manual:
 	    --email $(PACKAGE_BUGREPORT) $(PACKAGE) \
 	    "$(PACKAGE_NAME) - $(manual_title)"
 	@echo " *** Upload the doc/manual directory to web-cvs."
+
+# If you want to set UPDATE_COPYRIGHT_* environment variables,
+# put the assignments in this variable.
+update-copyright-env ?=
+
+# Run this rule once per year (usually early in January)
+# to update all FSF copyright year lists in your project.
+# If you have an additional project-specific rule,
+# add it in cfg.mk along with a line 'update-copyright: prereq'.
+# By default, exclude all variants of COPYING; you can also
+# add exemptions (such as ChangeLog..* for rotated change logs)
+# in the file .x-update-copyright.
+.PHONY: update-copyright
+update-copyright:
+	grep -l -w Copyright $$($(VC_LIST_EXCEPT))		\
+		$(srcdir)/ChangeLog | grep -v COPYING		\
+	  | $(update-copyright-env) xargs $(build_aux)/$@
-- 
1.6.3.3.334.g916e1


From 935f8158c44060778ae60a382328b540b6c71d75 Mon Sep 17 00:00:00 2001
From: Eric Blake <[email protected]>
Date: Fri, 14 Aug 2009 15:16:33 -0600
Subject: [PATCH 2/2] Update copyright year.

* AUTHORS: Run UPDATE_COPYRIGHT_FORCE=1 make update-copyright.
* BACKLOG: Likewise.
* Makefile.am: Likewise.
* TODO: Likewise.
* acinclude.m4: Likewise.
* c-boxes.el: Likewise.
* cfg.mk: Likewise.
* checks/Makefile.in: Likewise.
* checks/check-them: Likewise.
* checks/stackovf.test: Likewise.
* doc/Makefile.am: Likewise.
* examples/Makefile.am: Likewise.
* src/Makefile.am: Likewise.
* src/debug.c: Likewise.
* src/eval.c: Likewise.
* src/freeze.c: Likewise.
* src/m4.h: Likewise.
* src/macro.c: Likewise.
* src/path.c: Likewise.
* src/symtab.c: Likewise.

Signed-off-by: Eric Blake <[email protected]>
---
 AUTHORS              |    2 +-
 BACKLOG              |    2 +-
 ChangeLog            |   22 ++++++++++++++++++++++
 Makefile.am          |    4 ++--
 TODO                 |    2 +-
 acinclude.m4         |    3 ++-
 c-boxes.el           |    3 ++-
 cfg.mk               |    3 ++-
 checks/Makefile.in   |    2 +-
 checks/check-them    |    3 ++-
 checks/stackovf.test |    3 ++-
 doc/Makefile.am      |    2 +-
 examples/Makefile.am |    2 +-
 src/Makefile.am      |    2 +-
 src/debug.c          |    4 ++--
 src/eval.c           |    2 +-
 src/freeze.c         |    4 ++--
 src/m4.h             |    2 +-
 src/macro.c          |    4 ++--
 src/path.c           |    4 ++--
 src/symtab.c         |    2 +-
 21 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 40d8361..e55f47b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,7 +28,7 @@ Markus Duft                 [email protected]        2006-08-03

 ========================================================================

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

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
diff --git a/BACKLOG b/BACKLOG
index 96562a5..6cd9a92 100644
--- a/BACKLOG
+++ b/BACKLOG
@@ -50,7 +50,7 @@ rmail/speed
  2. 05 Sep 94 <[email protected]> slowness
  3. 04 Oct 94 <pinard> Autoconf, m4, and dnl's.

-Copyright (C) 2000, 2006 Free Software Foundation, Inc.
+Copyright (C) 2000, 2006, 2009 Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
diff --git a/ChangeLog b/ChangeLog
index 052f019..37dc678 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 2009-08-17  Eric Blake  <[email protected]>

+	Update copyright year.
+	* AUTHORS: Run UPDATE_COPYRIGHT_FORCE=1 make update-copyright.
+	* BACKLOG: Likewise.
+	* Makefile.am: Likewise.
+	* TODO: Likewise.
+	* acinclude.m4: Likewise.
+	* c-boxes.el: Likewise.
+	* cfg.mk: Likewise.
+	* checks/Makefile.in: Likewise.
+	* checks/check-them: Likewise.
+	* checks/stackovf.test: Likewise.
+	* doc/Makefile.am: Likewise.
+	* examples/Makefile.am: Likewise.
+	* src/Makefile.am: Likewise.
+	* src/debug.c: Likewise.
+	* src/eval.c: Likewise.
+	* src/freeze.c: Likewise.
+	* src/m4.h: Likewise.
+	* src/macro.c: Likewise.
+	* src/path.c: Likewise.
+	* src/symtab.c: Likewise.
+
 	Prepare to bulk update copyright year.
 	* gnulib: Update.
 	* m4/gnulib-cache.m4: Import update-copyright and vc-list-files
diff --git a/Makefile.am b/Makefile.am
index f98266c..a579c86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free
-## Software Foundation, Inc.
+## Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+## Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/TODO b/TODO
index 4f1ea39..81e1b89 100644
--- a/TODO
+++ b/TODO
@@ -37,7 +37,7 @@ mode: outline
 outline-regexp: " *[-+*.] \\|"
 End:

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

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
diff --git a/acinclude.m4 b/acinclude.m4
index c14a5e3..cb4fc2f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,6 @@
 # Local additions to Autoconf macros.
-# Copyright (C) 1992, 1994, 2004, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1994, 2004, 2006, 2008, 2009 Free Software
+# Foundation, Inc.
 # Francois Pinard <[email protected]>, 1992.
 #
 # This file is free software; the Free Software Foundation
diff --git a/c-boxes.el b/c-boxes.el
index 35e4d99..5254e96 100644
--- a/c-boxes.el
+++ b/c-boxes.el
@@ -1,5 +1,6 @@
 ;;; Boxed comments for C mode.
-;;; Copyright (C) 1991, 1992, 1993, 1994, 2008 Free Software Foundation, Inc.
+;;; Copyright (C) 1991, 1992, 1993, 1994, 2008, 2009 Free Software
+;;; Foundation, Inc.
 ;;; Francois Pinard <[email protected]>, April 1991.
 ;;;
 ;;; This file is part of GNU M4.
diff --git a/cfg.mk b/cfg.mk
index 9db2583..c63b953 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,6 @@
 # Customize maint.mk.                           -*- makefile -*-
-# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 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
diff --git a/checks/Makefile.in b/checks/Makefile.in
index c43c2cc..b2903ff 100644
--- a/checks/Makefile.in
+++ b/checks/Makefile.in
@@ -1,6 +1,6 @@
 ## Makefile.in - template for building Makefile for M4 testsuite.
 ##
-## Copyright (C) 1992, 1993, 1994, 2006, 2007, 2008 Free Software
+## Copyright (C) 1992, 1993, 1994, 2006, 2007, 2008, 2009 Free Software
 ## Foundation, Inc.
 ##
 ## This file is part of GNU M4.
diff --git a/checks/check-them b/checks/check-them
index e594119..42ca8a3 100755
--- a/checks/check-them
+++ b/checks/check-them
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Check GNU m4 against examples from the manual source.
-# Copyright (C) 1992, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1992, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/checks/stackovf.test b/checks/stackovf.test
index 0ab0ccb..47d0841 100755
--- a/checks/stackovf.test
+++ b/checks/stackovf.test
@@ -1,6 +1,7 @@
 #!/bin/sh
 # This file is part of the GNU m4 testsuite
-# Copyright (C) 2000, 2003, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2003, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 94461f0..e217237 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+## Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/examples/Makefile.am b/examples/Makefile.am
index d3e0a24..fd2a289 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+## Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/src/Makefile.am b/src/Makefile.am
index 80b9acf..58a5ac6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+## Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/src/debug.c b/src/debug.c
index c94a746..0c9ee37 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

-   Copyright (C) 1991, 1992, 1993, 1994, 2004, 2006, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 1991, 1992, 1993, 1994, 2004, 2006, 2007, 2009 Free
+   Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/eval.c b/src/eval.c
index d35364c..f55bf52 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor

-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007, 2009
    Free Software Foundation, Inc.

    This file is part of GNU M4.
diff --git a/src/freeze.c b/src/freeze.c
index ddc2e08..041bed4 100644
--- a/src/freeze.c
+++ b/src/freeze.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007, 2008
-   Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007, 2008,
+   2009 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/m4.h b/src/m4.h
index d741ed9..b82fb37 100644
--- a/src/m4.h
+++ b/src/m4.h
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, 2006,
-   2007, 2008 Free Software Foundation, Inc.
+   2007, 2008, 2009 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/macro.c b/src/macro.c
index f9c5fe1..73547ea 100644
--- a/src/macro.c
+++ b/src/macro.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007 Free
-   Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007, 2009
+   Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/path.c b/src/path.c
index 317bd4e..b846161 100644
--- a/src/path.c
+++ b/src/path.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 2004, 2006, 2007, 2008
-   Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 2004, 2006, 2007, 2008,
+   2009 Free Software Foundation, Inc.

    This file is part of GNU M4.

diff --git a/src/symtab.c b/src/symtab.c
index b755790..56e8703 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor

    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2003, 2006, 2007,
-   2008 Free Software Foundation, Inc.
+   2008, 2009 Free Software Foundation, Inc.

    This file is part of GNU M4.

-- 
1.6.3.3.334.g916e1