The file build-aux/gnupload was recently modified to use GPLv2 instead of GPLv3 in gnulib, but I'd like to use GPLv3 on it for consistency. This patch allows gnulib-tool to be able to change the license from GPLv2 to GPLv3 just like it can already do for lib/* files.
Pushed. /Simon --- ChangeLog | 4 ++++ gnulib-tool | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b49c11..d71b5cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-05-28 Simon Josefsson <si...@josefsson.org> + + * gnulib-tool: Transform license on build-aux/ files too. + 2009-05-27 Simon Josefsson <si...@josefsson.org> * gnulib-tool (sed_transform_main_lib_file) diff --git a/gnulib-tool b/gnulib-tool index 36ee714..c633da2 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -2874,6 +2874,17 @@ s,^\(.................................................[^ ]*\) *, fi fi + # Determine script to apply to auxilliary files that go into $auxdir/. + sed_transform_build_aux_file="$sed_transform_lib_file" + if test -n "$do_copyrights"; then + # Update license. + sed_transform_build_aux_file=$sed_transform_build_aux_file' + s/GNU Lesser General/GNU General/g + s/GNU Library General/GNU General/g + s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g + ' + fi + # Determine script to apply to library files that go into $testsbase/. sed_transform_testsrelated_lib_file="$sed_transform_lib_file" if test -n "$do_copyrights"; then @@ -3025,6 +3036,14 @@ s,^\(.................................................[^ ]*\) *, ;; esac fi + if test -n "$sed_transform_build_aux_file"; then + case "$of" in + build-aux/*) + sed -e "$sed_transform_build_aux_file" \ + < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" + ;; + esac + fi if test -n "$sed_transform_testsrelated_lib_file"; then case "$of" in tests=lib/*) -- 1.6.2.4