GPLv3 re-licensing

[Simon Josefsson]

How about this?

I haven't been following the re-licensing discussions closely (still
catching up), but these files seems to be used during the build phase,
and using the GPLv3 for that seems non-controversial, or?

Btw, libidn 1.0 (recently released) uses latest gnulib, and there were
no license problems.  I'm doing the same exercise now with gsasl, but it
seems there are no conflicts there either.

/Simon

Index: ChangeLog
===================================================================
RCS file: /sources/gnulib/gnulib/ChangeLog,v
retrieving revision 1.1872
diff -u -p -r1.1872 ChangeLog
--- ChangeLog   31 Jul 2007 22:34:58 -0000      1.1872
+++ ChangeLog   6 Aug 2007 13:55:04 -0000
@@ -1,3 +1,7 @@
+2007-08-06  Simon Josefsson  <address@hidden>
+
+       * build-aux/maint.mk, build-aux/GNUmakefile: Relicense to GPLv3+.
+
 2007-07-31  Bruno Haible  <address@hidden>
 
        * m4/stdint.m4 (gl_STDINT_H): Test whether WCHAR_MIN and WCHAR_MAX
Index: build-aux/GNUmakefile
===================================================================
RCS file: /sources/gnulib/gnulib/build-aux/GNUmakefile,v
retrieving revision 1.2
diff -u -p -r1.2 GNUmakefile
--- build-aux/GNUmakefile       14 Feb 2006 12:52:55 -0000      1.2
+++ build-aux/GNUmakefile       6 Aug 2007 13:55:04 -0000
@@ -4,21 +4,20 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.
 
-# Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2006, 2007 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
-# the Free Software Foundation; either version 2 of the License, 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/>.
 
 # Systems where /bin/sh is not the default shell need this.  The $(shell)
 # command below won't work with e.g. stock DOS/Windows shells.
Index: build-aux/maint.mk
===================================================================
RCS file: /sources/gnulib/gnulib/build-aux/maint.mk,v
retrieving revision 1.8
diff -u -p -r1.8 maint.mk
--- build-aux/maint.mk  29 Jun 2007 03:51:18 -0000      1.8
+++ build-aux/maint.mk  6 Aug 2007 13:55:04 -0000
@@ -2,22 +2,20 @@
 # This Makefile fragment is intended to be useful by any GNU-like project.
 # This file originate from coreutils, CPPI, Bison, and Autoconf.
 
-## Copyright (C) 2001-2007 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
-## the Free Software Foundation; either version 2, 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.
+# Copyright (C) 2001-2007 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
+# 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, see <http://www.gnu.org/licenses/>.
 
 ME := maint.mk