From 27d1d32a202b6b2115d5c2e287e3f5f1090032e5 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 2 Dec 2016 16:56:11 +0100 Subject: [PATCH] gnulib-tool: fix the previous change * gnulib-tool (func_import): Relax the regex for the end marker of original license text. --- ChangeLog | 5 +++++ gnulib-tool | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ebfa4670c0..d01c5edc57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-12-02 Daiki Ueno + + * gnulib-tool (func_import): Relax the regex for the end marker of + original license text. + 2016-12-02 Nikos Mavrogiannopoulos * gnulib-tool (func_import): Adhere to the license guideline when diff --git a/gnulib-tool b/gnulib-tool index 374e4236e8..b20539486e 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -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:\ \ -- 2.39.5