Handle copying terms "GPLv2+" and "LGPLv2+".

diff --git a/ChangeLog b/ChangeLog
index b060d492de21b385acc887b5237a448bf7ffc367..9395cc35aee0b1d931c82b481e0a6447086c318f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-13  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_import): Treat LGPLv2 as synonymous to LGPL.
+       (func_create_testdir): Handle copying terms "GPLv2+" and "LGPLv2+".
+
 2007-07-12  Bruno Haible  <bruno@clisp.org>
 
        * doc/gnulib-intro.texi (Copyright): Clarify the license abbreviations

diff --git a/gnulib-tool b/gnulib-tool
index 39dad780f37d9897cb7d1f5d2b2064339dbdf773..c9029ca0b29e9c93276632de1e14304a83499b2b 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2007-07-10 12:25:38 $'
+cvsdatestamp='$Date: 2007-07-13 01:17:00 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -1940,7 +1940,7 @@ func_import ()
     for module in $modules; do
       license=`func_get_license $module`
       case $license in
-        LGPL | 'GPLed build tool') ;;
+        LGPL | LGPLv2+ | 'GPLed build tool') ;;
         'public domain' | 'unlimited' | 'unmodifiable license text') ;;
         *) func_fatal_error "incompatible license on module $module: $license" ;;
       esac
@@ -2655,10 +2655,31 @@ func_create_testdir ()
       func_modules_transitive_closure
       for module in $modules; do
         license=`func_get_license "$module"`
-        case $license in
-          LGPL | 'GPLed build tool') ;;
+        case "$license" in
+          'GPLed build tool') ;;
           'public domain' | 'unlimited' | 'unmodifiable license text') ;;
-          *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;;
+          *)
+            case "$requested_license" in
+              GPLv2+)
+                case "$license" in
+                  GPLv2+ | LGPLv2+) ;;
+                  *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;;
+                esac
+                ;;
+              LGPL)
+                case "$license" in
+                  LGPL | LGPLv2+) ;;
+                  *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;;
+                esac
+                ;;
+              LGPLv2+)
+                case "$license" in
+                  LGPLv2+) ;;
+                  *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;;
+                esac
+                ;;
+            esac
+            ;;
         esac
       done
     fi