From fa13cc7a25a8ebf44acef8a55371a6d690957f22 Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Mon, 26 Feb 2024 21:46:30 -0800 Subject: [PATCH] gnulib-tool.py: Follow gnulib-tool changes, part 30. Follow gnulib-tool change 2021-05-30 Bruno Haible Write 'LGPLv3+ or GPLv2+' instead of 'LGPLv3+ or GPLv2'. * pygnulib/GLImport.py (GLImport.prepare): Change. * pygnulib/GLTestDir.py (GLTestDir.execute): Likewise. --- ChangeLog | 9 +++++++++ gnulib-tool.py.TODO | 11 ----------- pygnulib/GLImport.py | 4 ++-- pygnulib/GLTestDir.py | 10 +++++----- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50ed84269a..ba1456b584 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2024-02-27 Collin Funk + + gnulib-tool.py: Follow gnulib-tool changes, part 30. + Follow gnulib-tool change + 2021-05-30 Bruno Haible + Write 'LGPLv3+ or GPLv2+' instead of 'LGPLv3+ or GPLv2'. + * pygnulib/GLImport.py (GLImport.prepare): Change. + * pygnulib/GLTestDir.py (GLTestDir.execute): Likewise. + 2024-02-27 Collin Funk gnulib-tool.py: Follow gnulib-tool changes, part 29. diff --git a/gnulib-tool.py.TODO b/gnulib-tool.py.TODO index 7be0e243e7..5f4a134edf 100644 --- a/gnulib-tool.py.TODO +++ b/gnulib-tool.py.TODO @@ -581,17 +581,6 @@ Date: Thu Jun 10 21:26:53 2021 +0200 -------------------------------------------------------------------------------- -commit 6d1cba373a8387aa2131e9dc3e94954c5669ca52 -Author: Bruno Haible -Date: Sun May 30 14:37:06 2021 +0200 - - Write 'LGPLv3+ or GPLv2+' instead of 'LGPLv3+ or GPLv2'. - - * modules/* (License): Change. - * gnulib-tool (func_import, func_create_testdir): Likewise. - --------------------------------------------------------------------------------- - commit 4b071c115309079528db7b60e8d2ffb22b129088 Author: Paul Eggert Date: Mon Apr 26 23:31:29 2021 -0700 diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index c69a33deb7..7f332ec760 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -858,8 +858,8 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix compatibilities['all'] = ['GPLv2+ build tool', 'GPLed build tool', 'public domain', 'unlimited', 'unmodifiable license text'] - compatibilities['3'] = ['LGPLv2+', 'LGPLv3+ or GPLv2', 'LGPLv3+', 'LGPL'] - compatibilities['3orGPLv2'] = ['LGPLv2+', 'LGPLv3+ or GPLv2'] + compatibilities['3'] = ['LGPLv2+', 'LGPLv3+ or GPLv2+', 'LGPLv3+', 'LGPL'] + compatibilities['3orGPLv2'] = ['LGPLv2+', 'LGPLv3+ or GPLv2+'] compatibilities['2'] = ['LGPLv2+'] if lgpl: for module in main_modules: diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index 3bb99c59cc..bc0b153304 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -204,16 +204,16 @@ class GLTestDir(object): 'public domain', 'unlimited', 'unmodifiable license text']: incompatible = False if requested_licence == 'GPLv3+' or requested_licence == 'GPL': - if license not in ['LGPLv2+', 'LGPLv3+ or GPLv2', 'LGPLv3+', 'LGPL', 'GPLv2+', 'GPLv3+', 'GPL']: + if license not in ['LGPLv2+', 'LGPLv3+ or GPLv2+', 'LGPLv3+', 'LGPL', 'GPLv2+', 'GPLv3+', 'GPL']: incompatible = True elif requested_licence == 'GPLv2+': - if license not in ['LGPLv2+', 'LGPLv3+ or GPLv2', 'GPLv2+']: + if license not in ['LGPLv2+', 'LGPLv3+ or GPLv2+', 'GPLv2+']: incompatible = True elif requested_licence == 'LGPLv3+' or requested_licence == 'LGPL': - if license not in ['LGPLv2+', 'LGPLv3+ or GPLv2', 'LGPLv3+', 'LGPL']: + if license not in ['LGPLv2+', 'LGPLv3+ or GPLv2+', 'LGPLv3+', 'LGPL']: incompatible = True - elif requested_licence == 'LGPLv3+ or GPLv2': - if license not in ['LGPLv2+', 'LGPLv3+ or GPLv2']: + elif requested_licence == 'LGPLv3+ or GPLv2+': + if license not in ['LGPLv2+', 'LGPLv3+ or GPLv2+']: incompatible = True elif requested_licence == 'LGPLv2+': if license not in ['LGPLv2+']: -- 2.39.5