Mercurial > gnulib

changeset 38223:c10d22a6cabc

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 for the end marker of original license text.
author Daiki Ueno <ueno@gnu.org>
date Fri, 02 Dec 2016 16:56:11 +0100
parents c77bf8bb39ee
children 3a3b15c67245
files ChangeLog gnulib-tool
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Nov 21 21:15:25 2016 +0100
+++ b/ChangeLog	Fri Dec 02 16:56:11 2016 +0100
@@ -1,3 +1,8 @@
+2016-12-02  Daiki Ueno  <ueno@gnu.org>
+
+	* gnulib-tool (func_import): Relax the regex for the end marker of
+	original license text.
+
 2016-12-02  Nikos Mavrogiannopoulos <nmav@gnutls.org>
 
 	* gnulib-tool (func_import): Adhere to the license guideline when
--- a/gnulib-tool	Mon Nov 21 21:15:25 2016 +0100
+++ b/gnulib-tool	Fri Dec 02 16:56:11 2016 +0100
@@ -4767,7 +4767,7 @@
           ;;
         3orGPLv2)
           sed_transform_main_lib_file=$sed_transform_main_lib_file'
-            /under the terms of /,/(at your option) any later version/d
+            /under the terms of /,/any later version/d
             /you can redistribute it and\/or modify it/a\
    under the terms of either:\
 \