summaryrefslogtreecommitdiff
path: root/gl
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2007-10-07 21:04:14 +0200
committerJim Meyering <meyering@redhat.com>2007-10-07 21:04:21 +0200
commit847fbc4eba6701fb1548713de855207a47e876f7 (patch)
treebd963917cca8f2cf7d332f328bcd82cc95f4f59e /gl
parenta5fa9f9cc9e3b582e896d00b62642cb695f573d9 (diff)
downloadcoreutils-847fbc4eba6701fb1548713de855207a47e876f7.tar.gz
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.
Diffstat (limited to 'gl')
-rw-r--r--gl/lib/tempname.c11
-rw-r--r--gl/lib/tempname.h9
2 files changed, 9 insertions, 11 deletions
diff --git a/gl/lib/tempname.c b/gl/lib/tempname.c
index 14eddd908..f9f351a5b 100644
--- 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 4e0469b3f..e3b68af79 100644
--- 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 */