From 31a08abd323ebffea3d4fb2d5a66f801fe8b3031 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 2 Dec 2016 17:16:50 +0100 Subject: [PATCH] gnulib-tool: fix the previous change * gnulib-tool (func_import): Relax the regex used for "LGPLv3+ or GPLv2" rewriting. --- ChangeLog | 4 ++-- gnulib-tool | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d01c5edc57..c8da20c64f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 2016-12-02 Daiki Ueno - * gnulib-tool (func_import): Relax the regex for the end marker of - original license text. + * gnulib-tool (func_import): Relax the regex used for "LGPLv3+ or + GPLv2" rewriting. 2016-12-02 Nikos Mavrogiannopoulos diff --git a/gnulib-tool b/gnulib-tool index b20539486e..6d22c217fc 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -4767,9 +4767,9 @@ s,^\(.................................................[^ ]*\) *, ;; 3orGPLv2) sed_transform_main_lib_file=$sed_transform_main_lib_file' - /under the terms of /,/any later version/d - /you can redistribute it and\/or modify it/a\ - under the terms of either:\ + /^ *This program is free software/i\ + This program is free software: you can redistribute it and\/or\ + modify it 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\ @@ -4782,6 +4782,7 @@ s,^\(.................................................[^ ]*\) *, option) any later version.\ \ or both in parallel, as here. + /^ *This program is free software/,/^$/d ' ;; 2) -- 2.39.5