Reflect 2->3 GPL copyright version update in gnulib.

* gl/lib/tempname.h: Update copyright from gnulib.
* gl/lib/tempname.c: Likewise.
* .x-sc_GPL_version: Don't make an exception for those two files.

diff --git a/.x-sc_GPL_version b/.x-sc_GPL_version
index 19bdfd9..d496afa 100644 (file)
--- a/.x-sc_GPL_version
+++ b/.x-sc_GPL_version
@@ -1,3 +1 @@
 ^build-aux/check\.mk$
-^gl/lib/tempname\.c$
-^gl/lib/tempname\.h$

diff --git a/ChangeLog b/ChangeLog
index 2b9eab2..157f126 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-10-07  Jim Meyering  <meyering@redhat.com>
 
+       Reflect 2->3 GPL copyright version update in gnulib.
+       * gl/lib/tempname.h: Update copyright from gnulib.
+       * gl/lib/tempname.c: Likewise.
+       * .x-sc_GPL_version: Don't make an exception for those two files.
+
        * configure.ac (AM_INIT_AUTOMAKE): Don't use dist-lzma just yet.
 
        New program: mktemp.

diff --git a/gl/lib/tempname.c b/gl/lib/tempname.c
index 14eddd9..f9f351a 100644 (file)
--- a/gl/lib/tempname.c
+++ b/gl/lib/tempname.c
@@ -4,19 +4,18 @@
    2000, 2001, 2002, 2003, 2005, 2006, 2007 Free Software Foundation,
    Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Extracted from glibc sysdeps/posix/tempname.c.  See also tmpdir.c.  */
 

diff --git a/gl/lib/tempname.h b/gl/lib/tempname.h
index 4e0469b..e3b68af 100644 (file)
--- a/gl/lib/tempname.h
+++ b/gl/lib/tempname.h
@@ -2,10 +2,10 @@
 
    Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* header written by Eric Blake */