From cbc2d84210a693a84e74f6524f754673182374c6 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 3 Jan 2011 15:58:49 -0700 Subject: 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. * NEWS: 1.4.16 will be in 2011. * doc/m4.texinfo (History): Likewise. Signed-off-by: Eric Blake --- NEWS | 5 ++--- README | 13 ++++++++++--- cfg.mk | 12 ++++++------ doc/m4.texi | 13 ++++++------- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/NEWS b/NEWS index 09f71033..f1b74b34 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ GNU M4 NEWS - History of user-visible changes. -*- outline -*- -* Noteworthy changes in Version 1.9b (200x-??-??) [beta] +* Noteworthy changes in Version 1.9b (201x-??-??) [beta] Released by ????, based on git version 1.9a-* NOTE - there are still a number of FIXMEs to resolve before this can be @@ -1208,8 +1208,7 @@ Local Variables: fill-column: 75 End: -Copyright (C) 1992, 1993, 1994, 1998, 2000, 2001, 2006, 2007, 2008, -2009, 2010 Free Software Foundation, Inc. +Copyright (C) 1992-1994, 2004-2011, 2013 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.3 or diff --git a/README b/README index 3caf6c6e..c07737ca 100644 --- a/README +++ b/README @@ -25,7 +25,12 @@ files, ranging from trivial test files to rather advanced macros. If you intend to use m4 seriously, you might find useful material down there. -See file `COPYING' for copying conditions. +See file `COPYING' for copying conditions. Note that M4 is distributed +under the GNU Public License version 3 or later. Some files in the +distribution are copied from the gnulib project, and hence bear the +designation version 2 or later because they are unmodified from gnulib; +however, if you modify these files using M4 rather than gnulib as the +source, you must update the license to be GPLv3 or later. See file `INSTALL' for compilation and installation instructions. See file `ABOUT-NLS' for how to customize this program to your language. See file `NEWS' for a list of major changes in the current release. @@ -83,10 +88,12 @@ make check TESTSUITEFLAGS='-v -d -x 12' The testsuite understands --help to tell you more about the current set of tests. +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) 2000, 2005, 2006, 2007, 2009, 2010 Free Software -Foundation, Inc. +Copyright (C) 2000, 2005-2011, 2013 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.3 or diff --git a/cfg.mk b/cfg.mk index d03f1bcf..2bb9e4c9 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1,5 +1,5 @@ # Customize maint.mk. -*- makefile -*- -# Copyright (C) 2003-2010 Free Software Foundation, Inc. +# Copyright (C) 2003-2011, 2013 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 @@ -17,6 +17,11 @@ # Used in maint.mk's web-manual rule manual_title = GNU macro processor +# Always use shorthand copyrights. +update-copyright-env = \ + UPDATE_COPYRIGHT_USE_INTERVALS=1 \ + UPDATE_COPYRIGHT_MAX_LINE_LENGTH=72 + # Tests not to run as part of "make syntax-check". # M4 intentionally uses a coding style that compiles under C++. # sc_proper_name_utf8_requires_ICONV doesn't work with non-recursive Makefile @@ -32,11 +37,6 @@ _makefile_at_at_check_exceptions = ' && !/PRAGMA_SYSTEM_HEADER/' # Hash of NEWS contents, to ensure we don't add entries to wrong section. old_NEWS_hash = 63ea02337d29e0ce5574ec04d87df4f9 -# Always use longhand copyrights. -update-copyright-env = \ - UPDATE_COPYRIGHT_USE_INTERVALS=0 \ - UPDATE_COPYRIGHT_MAX_LINE_LENGTH=72 - # Indent only with spaces. sc_prohibit_tab_based_indentation: @re='^ * ' \ diff --git a/doc/m4.texi b/doc/m4.texi index dbda71bb..84382a73 100644 --- a/doc/m4.texi +++ b/doc/m4.texi @@ -45,9 +45,8 @@ This manual (@value{UPDATED}) is for GNU M4 (version @value{VERSION}), a package containing an implementation of the m4 macro language. -Copyright @copyright{} 1989, 1990, 1991, 1992, 1993, 1994, 1998, 1999, -2000, 2001, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -Foundation, Inc. +Copyright @copyright{} 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, +2006, 2007, 2008, 2009, 2010, 2011, 2013 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -417,10 +416,10 @@ released 1.4.3 and 1.4.4. And in 2006, Eric Blake joined the team and prepared patches for the release of 1.4.5, 1.4.6, 1.4.7, and 1.4.8. More bug fixes were incorporated in 2007, with releases 1.4.9 and 1.4.10. Eric continued with some portability fixes for 1.4.11 and -1.4.12 in 2008, 1.4.13 in 2009, 1.4.14, 1.4.15 and 1.4.16 in 2010. -Following a long hiatus, Gary released 1.4.17 after upgrading to the -latest autotools (and gnulib) along with all the small fixes they had -accumulated. +1.4.12 in 2008, 1.4.13 in 2009, 1.4.14 and 1.4.15 in 2010, and 1.4.16 +in 2011. Following a long hiatus, Gary released 1.4.17 after upgrading +to the latest autotools (and gnulib) along with all the small fixes they +had accumulated. Additionally, in 2008, Eric rewrote the scanning engine to reduce recursive evaluation from quadratic to linear complexity. This was -- cgit v1.2.1