>From a8f2dda75f0322d9c5d2e2cd8cebd6237b5249b1 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 4 Jun 2021 20:42:44 +0200 Subject: [PATCH] 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+. --- ChangeLog | 9 +++++++++ gnulib-tool | 4 ++-- modules/git-merge-changelog | 2 +- modules/gnupload | 2 +- pygnulib/GLImport.py | 3 ++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e2bb84..07045eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2021-06-04 Bruno Haible + 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 + New directory with license notices. * etc/license-notices/*: New files. diff --git a/gnulib-tool b/gnulib-tool index 205503a..ad71f6e 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -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 diff --git a/modules/git-merge-changelog b/modules/git-merge-changelog index c58ddc7..a88573c 100644 --- a/modules/git-merge-changelog +++ b/modules/git-merge-changelog @@ -35,7 +35,7 @@ git_merge_changelog_LDADD = libgnu.a @LIBINTL@ $(LIBTHREAD) Include: License: -GPL +GPLv2+ Maintainer: all diff --git a/modules/gnupload b/modules/gnupload index acb4f0e..37179c2 100644 --- a/modules/gnupload +++ b/modules/gnupload @@ -15,7 +15,7 @@ Makefile.am: Include: License: -GPLed build tool +GPLv2+ build tool Maintainer: coreutils diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index 27a01be..4fa0025 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -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+'] -- 2.7.4