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.
(cherry picked from commit 355bdbdc723fe79beb6a8aeb04b516eac64c3ec8)

diff --git a/.x-update-copyright b/.x-update-copyright
index 58e51a692c29ed28b0064ad0bf524740bf2218a2..14487e12e735e33bdac81bb519bbf78fb8966896 100644 (file)
--- 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 c8435f68d09de8ffdae4ca0e991cb3a7e6360f98..baf2862db4a6b65289b15a275cd04cd290054a46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-03  Joel E. Denny  <joeldenny@joeldenny.org>
+
+       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  <joeldenny@joeldenny.org>
 
        maint: run "make update-copyright".

diff --git a/bootstrap b/bootstrap
index ecf2517840c122526c967f0c576cd7ececf23ae4..dcd4773973dc0ba4b1230ccda1a101eca680243c 100755 (executable)
--- 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 064aad2426794de968dd43d5b4c2daba8fdb4a1a..02ddc05f003202f936c37096ece3af3dd75ce8eb 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -66,4 +66,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