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

diff --git a/ChangeLog b/ChangeLog
index 18f5b2df4ec724cbf8d813a3c1992c4f714b9d96..8ea2319f43afd892af14318c9647e7099c639db5 100644 (file)
--- 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.
 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 760d404a7bde03ee70ef504ce028f97ccb2a9fe6..5d3a7854bf79d0b5328dd4da7c5a34ceb56313a2 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2279,6 +2279,13 @@ func_import ()
           ;;
         *) func_fatal_error "invalid value lgpl=$lgpl" ;;
       esac
           ;;
         *) 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
 
     fi
   fi