* MODULES.html.sh (Support for building documentation): Add gpl, lgpl.

* gnulib-tool (func_import): New license type 'unmodifiable license
text'.
* modules/fdl: Use it.  Longer description.
* module/gpl, module/lgpl: New files.

diff --git a/ChangeLog b/ChangeLog
index d995f06c7e52a60f7d03c9df1b9324ce47c1d29f..5d2991e1266eb9ca7bd534292cdd8ad7b290f01a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-30  Paul Eggert  <eggert@cs.ucla.edu>
+       and Simon Josefsson  <jas@extundo.com>
+       and Oskar Liljeblad  <oskar@osk.mine.nu>
+
+       * MODULES.html.sh (Support for building documentation): Add gpl, lgpl.
+       * gnulib-tool (func_import): New license type 'unmodifiable license
+       text'.
+       * modules/fdl: Use it.  Longer description.
+       * module/gpl, module/lgpl: New files.
+
 2006-08-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        * modules/isapipe: New file.

diff --git a/MODULES.html.sh b/MODULES.html.sh
index fe2c8b120c9646f49e42471ce052d355d98b7c91..357563370af51f535cb96bcd1b99fba2b50c6432 100755 (executable)
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -2117,6 +2117,8 @@ func_all_modules ()
   func_begin_table
   func_module fdl
   func_module gendocs
+  func_module gpl
+  func_module lgpl
   func_module regexprops-generic
   func_end_table
 

diff --git a/gnulib-tool b/gnulib-tool
index 79b8ff53a9a7253f6cfb5fd201b0babe288dc598..361201c0751127de30dcc65b560c31c7ed1e81aa 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-08-28 19:39:49 $'
+cvsdatestamp='$Date: 2006-08-30 18:13:34 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -1399,12 +1399,13 @@ func_import ()
   # Add the dummy module if needed.
   func_modules_add_dummy
 
-  # If --lgpl, check the license of modules are compatible.
+  # If --lgpl, verify that the licenses of modules are compatible.
   if test -n "$lgpl"; then
     for module in $modules; do
       license=`func_get_license $module`
       case $license in
-        LGPL | 'GPLed build tool' | 'public domain' | 'unlimited') ;;
+        LGPL | 'GPLed build tool') ;;
+       'public domain' | 'unlimited' | 'unmodifiable license text') ;;
         *) func_fatal_error "incompatible license on module $module: $license" ;;
       esac
     done

diff --git a/modules/fdl b/modules/fdl
index ed7f4d73249236db7a338b020f49ec9d02b9bef7..6d6f85996a765cd8c9e53312fa54e00847f4840a 100644 (file)
--- a/modules/fdl
+++ b/modules/fdl
@@ -1,5 +1,5 @@
 Description:
-Provide the Free Documentation License.
+Provide the GNU Free Documentation License in Texinfo format.
 
 Files:
 doc/fdl.texi
@@ -13,7 +13,7 @@ Makefile.am:
 Include:
 
 License:
-public domain
+unmodifiable license text
 
 Maintainer:
 all

diff --git a/modules/gpl b/modules/gpl
new file mode 100644 (file)
index 0000000..3d56cbb
--- /dev/null
+++ b/modules/gpl
@@ -0,0 +1,19 @@
+Description:
+Provide the GNU General Public License in Texinfo format.
+
+Files:
+doc/gpl.texi
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+
+Include:
+
+License:
+unmodifiable license text
+
+Maintainer:
+all

diff --git a/modules/lgpl b/modules/lgpl
new file mode 100644 (file)
index 0000000..c69d9c7
--- /dev/null
+++ b/modules/lgpl
@@ -0,0 +1,19 @@
+Description:
+Provide the GNU Lesser General Public License in Texinfo format.
+
+Files:
+doc/lgpl.texi
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+
+Include:
+
+License:
+unmodifiable license text
+
+Maintainer:
+all