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

* NEWS: Document this change.

diff --git a/ChangeLog b/ChangeLog
index 1ebbbafd87baa6ebb7a3e9142869dd1e3c58e486..cb2a3e64bcb3fbcd76ff8f2933b107a75ad9609b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-10  Eric Blake  <ebb9@byu.net>
+
+       * lib/version-etc.c (version_etc_va): Default to GPLv3+.
+       * NEWS: Document this change.
+
 2007-07-08  Bruno Haible  <bruno@clisp.org>
 
        Update to Unicode 5.0.

diff --git a/NEWS b/NEWS
index f3040a4a09a686c3d4040c346487d4cbfe4f8de6..9535412cce66a078caed6c2a7eec0dbfd02b5a31 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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>.
 

diff --git a/lib/version-etc.c b/lib/version-etc.c
index 1ae82c4179d86ba61376e08aaf9a2eb390226836..14f101e553abecaed146d2516a43742187c98c25 100644 (file)
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -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\