[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: fix the license output by --lgpl=3orGPLv2
From: |
Daiki Ueno |
Subject: |
Re: fix the license output by --lgpl=3orGPLv2 |
Date: |
Fri, 02 Dec 2016 14:22:08 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) |
Nikos Mavrogiannopoulos <address@hidden> writes:
> The recent patch which added the option 3orGPLv2 didn't modify the
> license text to reflect the 3orGPLv2 license. This patch attempts to do
> just that (it's a bit ugly but the result seems ok).
Thank you. I have pushed a slightly modified version (as attached) to
create a libunistring release.
Regards,
--
Daiki Ueno
>From 1aa6e23bd2487a7c3bd07cf693e6d968f74d951a Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <address@hidden>
Date: Mon, 21 Nov 2016 21:15:25 +0100
Subject: [PATCH] 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
---
ChangeLog | 6 ++++++
gnulib-tool | 21 ++++++++++++++++++++-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 97fd170..ebfa467 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-02 Nikos Mavrogiannopoulos <address@hidden>
+
+ * 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 <address@hidden>
localcharset: Avoid theoretical buffer overrun.
diff --git a/gnulib-tool b/gnulib-tool
index 5145d47..374e423 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -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
--
2.9.3
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: fix the license output by --lgpl=3orGPLv2,
Daiki Ueno <=