Mercurial > hg > octave-lyh > gnulib-hg
changeset 9090:b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Fri, 13 Jul 2007 01:16:59 +0000 |
parents | 88ca1c53f8c3 |
children | d19ce23d01b0 |
files | ChangeLog gnulib-tool |
diffstat | 2 files changed, 31 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 @@ 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_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