Re: version-etc vs. GPLv3

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Bruno Haible on 7/10/2007 4:12 AM:
> Idea 3: Simply change the string in version-etc.c to say GPLv3+. Programs
> desiring to remain GPLv2+ (I doubt there will be many) can do so by using
> the gnulib-tool --local-dir option and this file lib/version-etc.c.diff:

Done.

2007-07-10  Eric Blake  <address@hidden>

        * lib/version-etc.c (version_etc_va): Default to GPLv3+.
        * NEWS: Document this change.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGk3n184KuGfSFAYARAm1tAJ9N7ftaVRSQGbPWCAHW61jOpvTwfwCgtjp9
XqvNJsShELPfSa8OelnjwUc=
=634G
-----END PGP SIGNATURE-----

Index: lib/version-etc.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/version-etc.c,v
retrieving revision 1.26
diff -u -p -r1.26 version-etc.c
--- lib/version-etc.c   23 Mar 2007 12:37:17 -0000      1.26
+++ lib/version-etc.c   10 Jul 2007 12:20:46 -0000
@@ -67,7 +67,7 @@ version_etc_va (FILE *stream,
 
   fputs (_("\
 \n\
-License GPLv2+: GNU GPL version 2 or later 
<http://gnu.org/licenses/gpl.html>\n\
+License GPLv3+: GNU GPL version 3 or later 
<http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 \n\
Index: NEWS
===================================================================
RCS file: /sources/gnulib/gnulib/NEWS,v
retrieving revision 1.22
diff -u -p -r1.22 NEWS
--- NEWS        7 Jul 2007 20:59:44 -0000       1.22
+++ NEWS        10 Jul 2007 12:20:46 -0000
@@ -6,6 +6,9 @@ User visible incompatible changes
 
 Date        Modules         Changes
 
+2007-07-10  version-etc     Output now mentions GPLv3+, not GPLv2+.  Use
+                            gnulib-tool --local-dir to override this.
+
 2007-07-07  wcwidth         The include file is changed from "wcwidth.h" to
                             <wchar.h>.