Mercurial > gnulib

changeset 38224:3a3b15c67245

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnulib-tool: fix the previous change * gnulib-tool (func_import): Relax the regex used for "LGPLv3+ or GPLv2" rewriting.
author Daiki Ueno <ueno@gnu.org>
date Fri, 02 Dec 2016 17:16:50 +0100
parents c10d22a6cabc
children b052d67dd6e2
files ChangeLog gnulib-tool
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Dec 02 16:56:11 2016 +0100
+++ b/ChangeLog	Fri Dec 02 17:16:50 2016 +0100
@@ -1,7 +1,7 @@
 2016-12-02  Daiki Ueno  <ueno@gnu.org>
 
-	* 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 <nmav@gnutls.org>
 
--- a/gnulib-tool	Fri Dec 02 16:56:11 2016 +0100
+++ b/gnulib-tool	Fri Dec 02 17:16:50 2016 +0100
@@ -4767,9 +4767,9 @@
           ;;
         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 @@
        option) any later version.\
 \
    or both in parallel, as here.
+            /^ *This program is free software/,/^$/d
           '
           ;;
         2)