+2024-02-27 Collin Funk <collin.funk1@gmail.com>
+
+ gnulib-tool.py: Follow gnulib-tool changes, part 30.
+ Follow gnulib-tool change
+ 2021-05-30 Bruno Haible <bruno@clisp.org>
+ 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 <collin.funk1@gmail.com>
gnulib-tool.py: Follow gnulib-tool changes, part 29.
--------------------------------------------------------------------------------
-commit 6d1cba373a8387aa2131e9dc3e94954c5669ca52
-Author: Bruno Haible <bruno@clisp.org>
-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 <eggert@cs.ucla.edu>
Date: Mon Apr 26 23:31:29 2021 -0700
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:
'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+']: