Re: Happy New Year

[Joel E. Denny]

On Sun, 2 Jan 2011, Joel E. Denny wrote:

> From: Joel E. Denny <address@hidden>
> Date: Sun, 2 Jan 2011 08:17:44 -0500
> Subject: [PATCH 2/3] maint: prepare to use date ranges in copyright notices.
> 
> * README (Copyright statements): New section explaining the range
> notation.  The GNU coding standards require this explanation.  I
> copied ours from coreutils.
> * build-aux/update-b4-copyright: Revert 2010-06-17 changes that
> disabled Bison's automated use of ranges.
> * cfg.mk (update-copyright-env): Likewise.

For the record, the FSF now permits year ranges in copyright statements, 
but your README must explain it.  Search for the word range at

http://www.gnu.org/prep/maintain/maintain.html#Copyright-Notices

Also, I just pushed the following to master and branch-2.5.

>From 355bdbdc723fe79beb6a8aeb04b516eac64c3ec8 Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Mon, 3 Jan 2011 09:00:09 -0500
Subject: [PATCH] maint: don't update copyright years in bootstrap.

* .x-update-copyright: Add entry for bootstrap.
* bootstrap: Remove 2011 from copyright years.  The bootstrap
version we're currently using comes from an older version of
gnulib.
* bootstrap.conf (bootstrap_sync): Add comments explaining this
issue.
---
 .x-update-copyright |    1 +
 ChangeLog           |   10 ++++++++++
 bootstrap           |    2 +-
 bootstrap.conf      |    5 +++++
 4 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/.x-update-copyright b/.x-update-copyright
index 58e51a6..14487e1 100644
--- a/.x-update-copyright
+++ b/.x-update-copyright
@@ -1,4 +1,5 @@
 COPYING
+^bootstrap$
 ^doc/fdl\.texi$
 ^doc/gpl-3\.0\.texi$
 ^doc/yacc\.1\.in$
diff --git a/ChangeLog b/ChangeLog
index 7de49c8..72605b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-03  Joel E. Denny  <address@hidden>
+
+       maint: don't update copyright years in bootstrap.
+       * .x-update-copyright: Add entry for bootstrap.
+       * bootstrap: Remove 2011 from copyright years.  The bootstrap
+       version we're currently using comes from an older version of
+       gnulib.
+       * bootstrap.conf (bootstrap_sync): Add comments explaining this
+       issue.
+
 2011-01-02  Joel E. Denny  <address@hidden>
 
        maint: run "make update-copyright".
diff --git a/bootstrap b/bootstrap
index ecf2517..dcd4773 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,7 +4,7 @@ scriptversion=2010-11-20.03; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-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/bootstrap.conf b/bootstrap.conf
index b7558e3..5a12b69 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -72,4 +72,9 @@ bootstrap_epilogue()
   touch src/parse-gram.[ch]
 }
 
+# Keep our bootstrap script in sync with gnulib's.  If we ever need to
+# maintain our own bootstrap script again, set this to false, remove
+# the bootstrap entry from the file .x-update-copyright, and add any
+# needed copyright years to the copyright statement in the bootstrap
+# script.
 bootstrap_sync=true
-- 
1.7.0.4