From e2d15e5c893e42b32a840a6641d5fa8cef7b4f7c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 3 Aug 2022 16:49:15 +0200 Subject: gnulib-tool.py: Follow gnulib-tool changes, part 23. Follow gnulib-tool changes 2016-11-11 Bruno Haible gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license. 2016-12-02 Nikos Mavrogiannopoulos gnulib-tool (func_import): Adhere to the license guideline ... 2016-12-02 Daiki Ueno gnulib-tool (func_import): Relax the regex ... * gnulib-tool.py: For --lgpl, accept value 3orGPLv2. * pygnulib/GLInfo.py (GLInfo.usage): Update. * pygnulib/GLConfig.py (GLConfig.setLGPL): Update argument check. * pygnulib/GLImport.py (GLImport.__init__, GLImport.gnulib_cache): Update gl_LGPL handling. (GLImport.prepare): Update license compatibility checks and license header rewriting. * pygnulib/GLTestDir.py (GLTestDir.execute): Update license compatibility checks. Handle also the licenses GPLv3+, GPL, LGPLv3+. --- pygnulib/GLInfo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pygnulib/GLInfo.py') diff --git a/pygnulib/GLInfo.py b/pygnulib/GLInfo.py index 79c1ba0cf1..720e357c90 100644 --- a/pygnulib/GLInfo.py +++ b/pygnulib/GLInfo.py @@ -251,7 +251,8 @@ Options for --import, --add/remove-import: placed (default \"tests\"). --aux-dir=DIRECTORY Directory relative to --dir where auxiliary build tools are placed (default comes from configure.ac). - --lgpl[=2|=3] Abort if modules aren't available under the LGPL. + --lgpl[=2|=3orGPLv2|=3] + Abort if modules aren't available under the LGPL. Also modify license template from GPL to LGPL. The version number of the LGPL can be specified; the default is currently LGPLv3. -- cgit v1.2.1