From a052732ba0f8fe7e298d02d60943834117855077 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 21 Nov 2016 21:15:25 +0100 Subject: [PATCH] gnulib-tool: properly list the LGPL3orGPLv2 license That is, include the text of both the LGPLv3 and GPLv2 in the headers. --- gnulib-tool | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnulib-tool b/gnulib-tool index 5145d47..8e735ad 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -4758,13 +4758,23 @@ 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' + 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 + s/version [23]\([ ,]\)/version 3\1/g + s/under the terms of/under the terms of either:\n\n */ + s/any later version./any later version.\n\n or\n\n * the GNU General Public License as published by the Free\n Software Foundation; either version 2 of the License, or\n (at your option) any later version.\n\n 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.10.1