gnulib: use more-standard license notice wording

* gnulib-tool (func_emit_copyright_notice): When emitting a
license notice into a file, use the standard wording as suggested
by the current information for GNU maintainers, except say "file"
rather than "program".  The new wording gives a license version
number, which addresses an issue raised by Glenn Morris in
<http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00397.html>.
* m4/onceonly.m4: Use that same wording here, too.

diff --git a/ChangeLog b/ChangeLog
index 12f5bca..cc22d35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-09-26  Paul Eggert  <eggert@cs.ucla.edu>
 
+       gnulib: use more-standard license notice wording
+       * gnulib-tool (func_emit_copyright_notice): When emitting a
+       license notice into a file, use the standard wording as suggested
+       by the current information for GNU maintainers, except say "file"
+       rather than "program".  The new wording gives a license version
+       number, which addresses an issue raised by Glenn Morris in
+       <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00397.html>.
+       * m4/onceonly.m4: Use that same wording here, too.
+
        dup2: minor simplification
        * m4/dup2.m4 (gl_PREREQ_DUP2): Don't require AC_C_INLINE,
        as lib/dup2.c no longer uses 'inline'.

diff --git a/gnulib-tool b/gnulib-tool
index 3356326..36135e6 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -348,10 +348,22 @@ func_emit_copyright_notice ()
                q
              }' < "$self_abspathname"
   echo "#"
-  echo "# This file is free software, distributed under the terms of the GNU"
-  echo "# General Public License.  As a special exception to the GNU General"
-  echo "# Public License, this file may be distributed as part of a program"
-  echo "# that contains a configuration script generated by Autoconf, under"
+  echo "# This file is free software; you can redistribute it and/or modify"
+  echo "# it under the terms of the GNU General Public License as published by"
+  echo "# the Free Software Foundation; either version 3 of the License, or"
+  echo "# (at your option) any later version."
+  echo "#"
+  echo "# This file is distributed in the hope that it will be useful,"
+  echo "# but WITHOUT ANY WARRANTY; without even the implied warranty of"
+  echo "# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the"
+  echo "# GNU General Public License for more details."
+  echo "#"
+  echo "# You should have received a copy of the GNU General Public License"
+  echo "# along with this file.  If not, see <http://www.gnu.org/licenses/>."
+  echo "#"
+  echo "# As a special exception to the GNU General Public License,"
+  echo "# this file may be distributed as part of a program that"
+  echo "# contains a configuration script generated by Autoconf, under"
   echo "# the same distribution terms as the rest of that program."
   echo "#"
   echo "# Generated by gnulib-tool."

diff --git a/m4/onceonly.m4 b/m4/onceonly.m4
index 223071a..254217c 100644 (file)
--- a/m4/onceonly.m4
+++ b/m4/onceonly.m4
@@ -1,9 +1,22 @@
-# onceonly.m4 serial 7
+# onceonly.m4 serial 8
 dnl Copyright (C) 2002-2003, 2005-2006, 2008-2011 Free Software Foundation,
 dnl Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
+dnl
+dnl This file is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This file is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this file.  If not, see <http://www.gnu.org/licenses/>.
+dnl
+dnl As a special exception to the GNU General Public License,
+dnl this file may be distributed as part of a program
 dnl that contains a configuration script generated by Autoconf, under
 dnl the same distribution terms as the rest of that program.