* gnulib-tool (func_import): Add support for 'public domain' license.

* modules/alloca, modules/atexit, modules/memmove:
Now public domain, not GPL.
* modules/dup2, modules/getpagesize, modules/malloc, modules/memset:
* modules/realloc, modules/strerror, modules/strtod:
Now LGPL, not GPL.

diff --git a/ChangeLog b/ChangeLog
index 0a05e7b24c3008f5aaa6ea596c75dec7c44d692b..2de24631e079b3f20484b25ce7029b58495c7e95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * gnulib-tool (func_import): Add support for 'public domain' license.
+       * modules/alloca, modules/atexit, modules/memmove:
+       Now public domain, not GPL.
+       * modules/dup2, modules/getpagesize, modules/malloc, modules/memset:
+       * modules/realloc, modules/strerror, modules/strtod:
+       Now LGPL, not GPL.
+
 2005-07-03  Paul Eggert  <eggert@cs.ucla.edu>
 
        Remove the dependency of the strftime module on the tzset module.

diff --git a/gnulib-tool b/gnulib-tool
index 47df7c8202104fd7c8fe22f812e099b93461b257..b04b09257e16ceff62621d8520f5d50e43238118 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2005-05-14 06:03:57 $'
+cvsdatestamp='$Date: 2005-07-05 07:14:00 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -573,9 +573,12 @@ func_import ()
   if test -n "$lgpl"; then
     for module in $modules; do
       license=`func_get_license $module`
-      if test $license != LGPL; then
-        func_fatal_error "incompatible license on module \`$module\`: $license"
-      fi
+      case $license in
+       LGPL | 'public domain') ;;
+       *)
+         func_fatal_error \
+           "incompatible license on module \`$module\`: $license" ;;
+      esac
     done
   fi
 

diff --git a/modules/alloca b/modules/alloca
index 2c3f2ccb5950cc0a6bd9845d099ce4bdff78f3d9..e044e35c8049f1c4f29753cce5862a96572a78b9 100644 (file)
--- a/modules/alloca
+++ b/modules/alloca
@@ -15,7 +15,7 @@ Include:
 #include <alloca.h>
 
 License:
-GPL
+public domain
 
 Maintainer:
 bug-gnulib@gnu.org

diff --git a/modules/atexit b/modules/atexit
index 0528724e99e8a2c9acac47d8be5a925222e9595e..adce14dc38ad746aad210b2db38275741c9a863b 100644 (file)
--- a/modules/atexit
+++ b/modules/atexit
@@ -16,8 +16,7 @@ Include:
 <stdlib.h>
 
 License:
-GPL
+public domain
 
 Maintainer:
 Jim Meyering
-

diff --git a/modules/dup2 b/modules/dup2
index 7b33e6f5c8847c97b767010241a8bac43ed4c643..db3a1f71c727e50641b06e8a30e5c0dedabf2341 100644 (file)
--- a/modules/dup2
+++ b/modules/dup2
@@ -16,8 +16,7 @@ Include:
 <unistd.h>
 
 License:
-GPL
+LGPL
 
 Maintainer:
 Paul Eggert, Jim Meyering
-

diff --git a/modules/getpagesize b/modules/getpagesize
index 8720b241529de66a568a64ecd3d75a5be1bba713..888bb145699ad152f57db88688881a90639193b5 100644 (file)
--- a/modules/getpagesize
+++ b/modules/getpagesize
@@ -16,7 +16,7 @@ Include:
 "getpagesize.h"
 
 License:
-GPL
+LGPL
 
 Maintainer:
 Jim Meyering

diff --git a/modules/malloc b/modules/malloc
index e16218197803a00aef33915b6fc8a9c61ab6fd92..4779af9b9a6613fc8abf7cf8285d9c189586820a 100644 (file)
--- a/modules/malloc
+++ b/modules/malloc
@@ -15,7 +15,7 @@ Include:
 <stdlib.h>
 
 License:
-GPL
+LGPL
 
 Maintainer:
 Jim Meyering

diff --git a/modules/memmove b/modules/memmove
index d96edceb4edf432947bf7824b129ef9c8b72d66e..6588c431305a66c499bb7e67540792ec6bffa2a5 100644 (file)
--- a/modules/memmove
+++ b/modules/memmove
@@ -16,8 +16,7 @@ Include:
 <string.h>
 
 License:
-GPL
+public domain
 
 Maintainer:
 Jim Meyering
-

diff --git a/modules/memset b/modules/memset
index 040f95533934b49bdbef26fc61e9189f0a142baa..e9a86039c6a3a83ed6f5eebfc9d1196e193a91c8 100644 (file)
--- a/modules/memset
+++ b/modules/memset
@@ -16,8 +16,7 @@ Include:
 <string.h>
 
 License:
-GPL
+LGPL
 
 Maintainer:
 Jim Meyering
-

diff --git a/modules/realloc b/modules/realloc
index 5273e4a5aa5b6493d8115bbcfc3bc7556ce96583..5aa68be1b96a4c25e7335d10772fee72dd3180ae 100644 (file)
--- a/modules/realloc
+++ b/modules/realloc
@@ -15,7 +15,7 @@ Include:
 <stdlib.h>
 
 License:
-GPL
+LGPL
 
 Maintainer:
 Jim Meyering

diff --git a/modules/strerror b/modules/strerror
index 5bed018b6cb3e8ca402e38aae7ada00aae748093..f86dd709ff0bcd5464274a84b3bc719802beaff1 100644 (file)
--- a/modules/strerror
+++ b/modules/strerror
@@ -16,8 +16,7 @@ Include:
 <string.h>
 
 License:
-GPL
+LGPL
 
 Maintainer:
 all
-

diff --git a/modules/strtod b/modules/strtod
index 74351486ae06e739dbeea1bd461daecd3b8047b3..4098b13641f5be157657918801cb98d73d4ce66f 100644 (file)
--- a/modules/strtod
+++ b/modules/strtod
@@ -17,7 +17,7 @@ Include:
 <stdlib.h>
 
 License:
-GPL
+LGPL
 
 Maintainer:
 all