Mercurial > gnulib

changeset 38222:c77bf8bb39ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnulib-tool: properly list the LGPL3orGPLv2 license * 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
author Nikos Mavrogiannopoulos <nmav@gnutls.org>
date Mon, 21 Nov 2016 21:15:25 +0100
parents c1fb353d8281
children c10d22a6cabc
files ChangeLog gnulib-tool
diffstat 2 files changed, 26 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Dec 02 13:52:43 2016 +0100
+++ b/ChangeLog	Mon Nov 21 21:15:25 2016 +0100
@@ -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.
--- a/gnulib-tool	Fri Dec 02 13:52:43 2016 +0100
+++ b/gnulib-tool	Mon Nov 21 21:15:25 2016 +0100
@@ -4758,13 +4758,32 @@
     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