Mercurial > hg > octave-lojdl > gnulib-hg
changeset 5963:6fb8c48c4dcd
* 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.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Tue, 05 Jul 2005 07:14:00 +0000 |
| parents | af056860e021 |
| children | 111f78a51516 |
| files | ChangeLog gnulib-tool modules/alloca modules/atexit modules/dup2 modules/getpagesize modules/malloc modules/memmove modules/memset modules/realloc modules/strerror modules/strtod |
| diffstat | 12 files changed, 26 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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 @@ 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
--- a/modules/alloca +++ b/modules/alloca @@ -15,7 +15,7 @@ #include <alloca.h> License: -GPL +public domain Maintainer: bug-gnulib@gnu.org
--- a/modules/atexit +++ b/modules/atexit @@ -16,8 +16,7 @@ <stdlib.h> License: -GPL +public domain Maintainer: Jim Meyering -
--- a/modules/dup2 +++ b/modules/dup2 @@ -16,8 +16,7 @@ <unistd.h> License: -GPL +LGPL Maintainer: Paul Eggert, Jim Meyering -
--- a/modules/getpagesize +++ b/modules/getpagesize @@ -16,7 +16,7 @@ "getpagesize.h" License: -GPL +LGPL Maintainer: Jim Meyering
--- a/modules/malloc +++ b/modules/malloc @@ -15,7 +15,7 @@ <stdlib.h> License: -GPL +LGPL Maintainer: Jim Meyering
--- a/modules/memmove +++ b/modules/memmove @@ -16,8 +16,7 @@ <string.h> License: -GPL +public domain Maintainer: Jim Meyering -
--- a/modules/memset +++ b/modules/memset @@ -16,8 +16,7 @@ <string.h> License: -GPL +LGPL Maintainer: Jim Meyering -
--- a/modules/realloc +++ b/modules/realloc @@ -15,7 +15,7 @@ <stdlib.h> License: -GPL +LGPL Maintainer: Jim Meyering