From: Bruno Haible <bruno@clisp.org>
Date: Mon, 29 Oct 2007 11:55:44 +0000 (+0100)
Subject: If --lgpl is not specified, convert copyright headers to GPLv3+.
X-Git-Tag: v0.0
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=refs%2Ftags%2Fv0.0;p=gnulib.git

If --lgpl is not specified, convert copyright headers to GPLv3+.
---

diff --git a/ChangeLog b/ChangeLog
index 18f5b2df4..8ea2319f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-29  Bruno Haible  <bruno@clisp.org>
+
+	* gnulib-tool (func_import): When --lgpl is not specified, set
+	sed_transform_lib_file to convert LGPL and GPLv2+ copyright headers to
+	GPLv3.
+	Reported by Simon Josefsson.
+
 2007-10-28  Bruno Haible  <bruno@clisp.org>
 
 	* lib/math.in.h: Test REPLACE_ISFINITE instead of HAVE_DECL_ISFINITE.
diff --git a/gnulib-tool b/gnulib-tool
index 760d404a7..5d3a7854b 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2279,6 +2279,13 @@ func_import ()
           ;;
         *) func_fatal_error "invalid value lgpl=$lgpl" ;;
       esac
+    else
+      # Update license.
+      sed_transform_lib_file=$sed_transform_lib_file'
+        s/GNU Lesser General/GNU General/g
+        s/GNU Library General/GNU General/g
+        s/version \(2\|2\.1\)\([ ,]\)/version 3\2/g
+      '
     fi
   fi