+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.
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