maint: document use of copyright ranges

* README: Copy coreutils wording for allowing copyright year
ranges.
* cfg.mk (UPDATE_COPYRIGHT_USE_INTERVALS): Now that GNU Coding
Standards permit it, prefer shorthand copyright.
* .x-update-copyright: Exempt an imported file.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/.x-update-copyright b/.x-update-copyright
index 1780d9b50b31aa49582e8a6ebbcd85e6ded5a8ed..d396f4bf6fd3ff0c817ca60c695697e457ec9484 100644 (file)
--- a/.x-update-copyright
+++ b/.x-update-copyright
@@ -14,3 +14,4 @@ doc/gendocs_template
 doc/gnu-oids.texi
 doc/make-stds.texi
 doc/standards.texi
+m4/autobuild.m4

diff --git a/ChangeLog b/ChangeLog
index c208a062d0b61538c2a523e0446feee0bc709c89..a5a490867fa9e6a90a23a703b87f934e0693d55f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-04  Eric Blake  <eblake@redhat.com>
+
+       maint: document use of copyright ranges
+       * README: Copy coreutils wording for allowing copyright year
+       ranges.
+       * cfg.mk (UPDATE_COPYRIGHT_USE_INTERVALS): Now that GNU Coding
+       Standards permit it, prefer shorthand copyright.
+       * .x-update-copyright: Exempt an imported file.
+
 2011-01-03  Karl Berry  <karl@freefriends.org>
 
        Avoid using @acronym in install.texi.
@@ -22413,7 +22422,7 @@
        End:
 
        Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-       2009, 2010 Free Software Foundation, Inc.
+       2009, 2010, 2011 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/README b/README
index 7b673720525459b4b5a2feb21621798e269f284e..0f79abf8cb293eaf21d7d330b585bacb3424e1ff 100644 (file)
--- a/README
+++ b/README
@@ -52,10 +52,13 @@ For more licensing information, see
 <http://www.gnu.org/licenses/gpl-faq.html> and
 <http://www.gnu.org/licenses/exceptions.html>.
 
+For any copyright year range specified as YYYY-ZZZZ in this package
+note that the range specifies every single year in that closed interval.
+
 -----
 
 Copyright (C) 1992, 1993, 1994, 1998, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+2005, 2006, 2007, 2008, 2009, 2010, 2011 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/cfg.mk b/cfg.mk
index c519cd0a7c1c0631aaa06afb3f71ae6a58ae8891..750ca2c1cc409be191fa3aaa4f1ee6906f737fb6 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk for Autoconf.            -*- Makefile -*-
-# Copyright (C) 2003, 2004, 2006, 2008, 2009, 2010 Free Software
+# Copyright (C) 2003, 2004, 2006, 2008, 2009, 2010, 2011 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
@@ -105,9 +105,9 @@ autom4te-update:
 local-checks-to-skip ?= \
   changelog-check sc_unmarked_diagnostics
 
-# Always use longhand copyrights.
+# Always use shorthand copyrights.
 update-copyright-env = \
-  UPDATE_COPYRIGHT_USE_INTERVALS=0 \
+  UPDATE_COPYRIGHT_USE_INTERVALS=1 \
   UPDATE_COPYRIGHT_MAX_LINE_LENGTH=72
 
 # Prevent incorrect NEWS edits.