]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool: properly list the LGPL3orGPLv2 license
authorNikos Mavrogiannopoulos <nmav@gnutls.org>
Mon, 21 Nov 2016 20:15:25 +0000 (21:15 +0100)
committerDaiki Ueno <ueno@gnu.org>
Fri, 2 Dec 2016 13:17:05 +0000 (14:17 +0100)
* gnulib-tool (func_import): Adhere to the license guideline when
rewriting the license text to "LGPLv3+ or GPLv2":
https://www.gnu.org/prep/maintain/maintain.html#Licensing-of-GNU-Packages

ChangeLog
gnulib-tool

index 97fd1708dc2ae3ea094877dcf6f714ec129d97bb..ebfa4670c030266dc96e224af73d4bbc9dc124b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-02  Nikos Mavrogiannopoulos <nmav@gnutls.org>
+
+       * gnulib-tool (func_import): Adhere to the license guideline when
+       rewriting the license text to "LGPLv3+ or GPLv2":
+       https://www.gnu.org/prep/maintain/maintain.html#Licensing-of-GNU-Packages
+
 2016-12-02  Bruno Haible  <bruno@clisp.org>
 
        localcharset: Avoid theoretical buffer overrun.
index 5145d47bdfafc74ccfd80a9d268f827cb6eee5bf..374e4236e8025db577665b8ee5a3c68251048e6a 100755 (executable)
@@ -4758,13 +4758,32 @@ s,^\(.................................................[^ ]*\) *,
     if test -n "$lgpl"; then
       # Update license.
       case "$lgpl" in
-        yes | 3 | 3orGPLv2)
+        yes | 3)
           sed_transform_main_lib_file=$sed_transform_main_lib_file'
             s/GNU General/GNU Lesser General/g
             s/General Public License/Lesser General Public License/g
             s/Lesser Lesser General Public License/Lesser General Public License/g
           '
           ;;
+        3orGPLv2)
+          sed_transform_main_lib_file=$sed_transform_main_lib_file'
+            /under the terms of /,/(at your option) any later version/d
+            /you can redistribute it and\/or modify it/a\
+   under the terms of either:\
+\
+     * the GNU Lesser General Public License as published by the Free\
+       Software Foundation; either version 3 of the License, or (at your\
+       option) any later version.\
+\
+   or\
+\
+     * the GNU General Public License as published by the Free\
+       Software Foundation; either version 2 of the License, or (at your\
+       option) any later version.\
+\
+   or both in parallel, as here.
+          '
+          ;;
         2)
           sed_transform_main_lib_file=$sed_transform_main_lib_file'
             s/GNU General/GNU Lesser General/g