Mercurial > hg > octave-lojdl > gnulib-hg

changeset 7235:3dbbe645b976

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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.
author Paul Eggert <eggert@cs.ucla.edu>
date Wed, 30 Aug 2006 18:13:34 +0000
parents cb0b761d8477
children c05b41ab8e3b
files ChangeLog MODULES.html.sh gnulib-tool modules/fdl modules/gpl modules/lgpl
diffstat 6 files changed, 56 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -2117,6 +2117,8 @@
   func_begin_table
   func_module fdl
   func_module gendocs
+  func_module gpl
+  func_module lgpl
   func_module regexprops-generic
   func_end_table
 
--- 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 @@
   # 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
--- 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 @@
 Include:
 
 License:
-public domain
+unmodifiable license text
 
 Maintainer:
 all
new file mode 100644
--- /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
new file mode 100644
--- /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