]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool: fix the previous change
authorDaiki Ueno <ueno@gnu.org>
Fri, 2 Dec 2016 15:56:11 +0000 (16:56 +0100)
committerDaiki Ueno <ueno@gnu.org>
Fri, 2 Dec 2016 15:57:02 +0000 (16:57 +0100)
* gnulib-tool (func_import): Relax the regex for the end marker of
original license text.

ChangeLog
gnulib-tool

index ebfa4670c030266dc96e224af73d4bbc9dc124b4..d01c5edc57e07fda933975317e33fdb9fd286ba4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
index 374e4236e8025db577665b8ee5a3c68251048e6a..b20539486e025632982cd038edbbcd0fca78b2ad 100755 (executable)
@@ -4767,7 +4767,7 @@ s,^\(.................................................[^ ]*\) *,
           ;;
         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:\
 \