From: Eric Blake <eblake@redhat.com>
Date: Tue, 4 Jan 2011 23:04:12 +0000 (-0700)
Subject: maint: document use of copyright ranges
X-Git-Tag: v2.68b~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8743e70d2fc6d49b9c535f6c4c598b2d88772dd3;p=thirdparty%2Fautoconf.git

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 1780d9b5..d396f4bf 100644
--- 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 c208a062..a5a49086 100644
--- 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 7b673720..0f79abf8 100644
--- 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 c519cd0a..750ca2c1 100644
--- 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.