From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 5 Jul 2005 07:14:00 +0000 (+0000)
Subject: * gnulib-tool (func_import): Add support for 'public domain' license.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55623f58e71800a93cc925fc4771ba5fe9828c5c;p=pspp

* 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 0a05e7b24c..2de24631e0 100644
--- 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 47df7c8202..b04b09257e 100755
--- 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 2c3f2ccb59..e044e35c80 100644
--- 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 0528724e99..adce14dc38 100644
--- 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 7b33e6f5c8..db3a1f71c7 100644
--- 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 8720b24152..888bb14569 100644
--- 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 e162181978..4779af9b9a 100644
--- 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 d96edceb4e..6588c43130 100644
--- 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 040f955339..e9a86039c6 100644
--- 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 5273e4a5aa..5aa68be1b9 100644
--- 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 5bed018b6c..f86dd709ff 100644
--- 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 74351486ae..4098b13641 100644
--- a/modules/strtod
+++ b/modules/strtod
@@ -17,7 +17,7 @@ Include:
 <stdlib.h>
 
 License:
-GPL
+LGPL
 
 Maintainer:
 all