upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-09-01 02:34:55 +00:00
Code Activity

gnupload, git-merge-changelog: Fix module description.

Browse Source 
* gnulib-tool (func_import, func_create_testdir): Treat
'GPLv2+ build tool' like 'GPLed build tool'.
* pygnulib/GLImport.py (prepare): Likewise.
* modules/gnupload (License): Change to 'GPLv2+ build tool'.
* modules/git-merge-changelog (License): Change to GPLv2+.
This commit is contained in:
Bruno Haible
2021-06-04 20:42:44 +02:00
parent efe8ff4b35
commit a8f2dda75f
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+9
View File
@@ -1,3 +1,12 @@
2021-06-04 Bruno Haible <bruno@clisp.org>
gnupload, git-merge-changelog: Fix module description.
* gnulib-tool (func_import, func_create_testdir): Treat
'GPLv2+ build tool' like 'GPLed build tool'.
* pygnulib/GLImport.py (prepare): Likewise.
* modules/gnupload (License): Change to 'GPLv2+ build tool'.
* modules/git-merge-changelog (License): Change to GPLv2+.
2021-06-04 Bruno Haible <bruno@clisp.org>
New directory with license notices.
gnulib-tool
+2 -2
View File
@@ -5039,7 +5039,7 @@ func_import ()
for module in $main_modules; do
license=`func_get_license $module`
case $license in
'GPLed build tool') ;;
'GPLv2+ build tool' | 'GPLed build tool') ;;
'public domain' | 'unlimited' | 'unmodifiable license text') ;;
*)
case "$lgpl" in
@@ -6240,7 +6240,7 @@ func_create_testdir ()
for module in $modules; do
license=`func_get_license "$module"`
case "$license" in
'GPLed build tool') ;;
'GPLv2+ build tool' | 'GPLed build tool') ;;
'public domain' | 'unlimited' | 'unmodifiable license text') ;;
*)
case "$requested_license" in
modules/git-merge-changelog
+1 -1
View File
@@ -35,7 +35,7 @@ git_merge_changelog_LDADD = libgnu.a @LIBINTL@ $(LIBTHREAD)
Include:
License:
GPL
GPLv2+
Maintainer:
all
modules/gnupload
+1 -1
View File
@@ -15,7 +15,7 @@ Makefile.am:
Include:
License:
GPLed build tool
GPLv2+ build tool
Maintainer:
coreutils
pygnulib/GLImport.py
+2 -1
View File
@@ -837,7 +837,8 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix
listing = list()
compatibilities = dict()
incompatibilities = string()
compatibilities['all'] = ['GPLed build tool', 'public domain', 'unlimited',
compatibilities['all'] = ['GPLv2+ build tool', 'GPLed build tool',
'public domain', 'unlimited',
'unmodifiable license text']
compatibilities[3] = ['LGPL', 'LGPLv2+', 'LGPLv3+']
compatibilities[2] = ['LGPLv2+']