Mercurial > hg > octave-nkf > gnulib-hg

changeset 9424:d852c1c185e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If --lgpl is not specified, convert copyright headers to GPLv3+.
author Bruno Haible <bruno@clisp.org>
date Mon, 29 Oct 2007 12:55:44 +0100
parents fa47aa8bb105
children b60ac48de79f
files ChangeLog gnulib-tool
diffstat 2 files changed, 14 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-29  Bruno Haible  <bruno@clisp.org>
+
+	* gnulib-tool (func_import): When --lgpl is not specified, set
+	sed_transform_lib_file to convert LGPL and GPLv2+ copyright headers to
+	GPLv3.
+	Reported by Simon Josefsson.
+
 2007-10-28  Bruno Haible  <bruno@clisp.org>
 
 	* lib/math.in.h: Test REPLACE_ISFINITE instead of HAVE_DECL_ISFINITE.
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2279,6 +2279,13 @@
           ;;
         *) func_fatal_error "invalid value lgpl=$lgpl" ;;
       esac
+    else
+      # Update license.
+      sed_transform_lib_file=$sed_transform_lib_file'
+        s/GNU Lesser General/GNU General/g
+        s/GNU Library General/GNU General/g
+        s/version \(2\|2\.1\)\([ ,]\)/version 3\2/g
+      '
     fi
   fi