diff options
| author | Bruno Haible <bruno@clisp.org> | 2021-05-30 14:37:06 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2021-05-30 14:38:24 +0200 |
| commit | 6d1cba373a8387aa2131e9dc3e94954c5669ca52 (patch) | |
| tree | 0edb72f8870cd2a469dcca59c4db0fabe1ca08b3 /gnulib-tool | |
| parent | 4b55e5d2c9c234230de84e19fee7f16be087960d (diff) | |
| download | gnulib-6d1cba373a8387aa2131e9dc3e94954c5669ca52.tar.gz | |
Write 'LGPLv3+ or GPLv2+' instead of 'LGPLv3+ or GPLv2'.
* modules/* (License): Change.
* gnulib-tool (func_import, func_create_testdir): Likewise.
Diffstat (limited to 'gnulib-tool')
| -rwxr-xr-x | gnulib-tool | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnulib-tool b/gnulib-tool index 9b5c81529c..205503a845 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -5045,13 +5045,13 @@ func_import () case "$lgpl" in yes | 3) case $license in - LGPLv2+ | 'LGPLv3+ or GPLv2' | LGPLv3+ | LGPL) ;; + LGPLv2+ | 'LGPLv3+ or GPLv2+' | LGPLv3+ | LGPL) ;; *) func_append license_incompatibilities "$module $license$nl" ;; esac ;; 3orGPLv2) case $license in - LGPLv2+ | 'LGPLv3+ or GPLv2') ;; + LGPLv2+ | 'LGPLv3+ or GPLv2+') ;; *) func_append license_incompatibilities "$module $license$nl" ;; esac ;; @@ -6246,25 +6246,25 @@ func_create_testdir () case "$requested_license" in GPLv3+ | GPL) case "$license" in - LGPLv2+ | 'LGPLv3+ or GPLv2' | LGPLv3+ | LGPL | GPLv2+ | GPLv3+ | GPL) ;; + LGPLv2+ | 'LGPLv3+ or GPLv2+' | LGPLv3+ | LGPL | GPLv2+ | GPLv3+ | GPL) ;; *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; esac ;; GPLv2+) case "$license" in - LGPLv2+ | 'LGPLv3+ or GPLv2' | GPLv2+) ;; + LGPLv2+ | 'LGPLv3+ or GPLv2+' | GPLv2+) ;; *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; esac ;; LGPLv3+ | LGPL) case "$license" in - LGPLv2+ | 'LGPLv3+ or GPLv2' | LGPLv3+ | LGPL) ;; + LGPLv2+ | 'LGPLv3+ or GPLv2+' | LGPLv3+ | LGPL) ;; *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; esac ;; - 'LGPLv3+ or GPLv2') + 'LGPLv3+ or GPLv2+') case "$license" in - LGPLv2+ | 'LGPLv3+ or GPLv2') ;; + LGPLv2+ | 'LGPLv3+ or GPLv2+') ;; *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; esac ;; |