From f23720c3969edb5394f8fc8bedaa9b4ae54c4184 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Tue, 26 Apr 2022 16:40:02 -0400 Subject: Clarify licensing of asciidoc-py to GPLv2+ (#236) --- README.md | 8 -------- asciidoc/a2x.py | 21 +++++++++++++++++++++ asciidoc/asciidoc.py | 9 +++++++-- asciidoc/resources/filters/code/code-filter.py | 8 +++++++- asciidoc/resources/filters/graphviz/graphviz2png.py | 12 ++++++++++-- asciidoc/resources/filters/latex/latex2img.py | 8 +++++++- asciidoc/resources/filters/music/music2png.py | 8 +++++++- asciidoc/resources/help.conf | 8 +++++++- asciidoc/resources/lang-cs.conf | 3 +-- asciidoc/resources/lang-pl.conf | 3 +++ doc/a2x.1.txt | 9 ++++++++- doc/asciidoc.1.txt | 8 +++++++- doc/asciidoc.txt | 16 ++++++++-------- setup.py | 5 ++--- 14 files changed, 95 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 7a8a28b..75a4fee 100644 --- a/README.md +++ b/README.md @@ -60,11 +60,3 @@ AsciiDoc.py has the following types of tests: 1. doctests: `python3 -m asciidoc.asciidoc --doctest` 1. unit tests: `python3 -m pytest` 1. integration tests: `python3 tests/testasciidoc.py` - -## LICENSE - -Copyright (C) 2002-2013 Stuart Rackham. -Copyright (C) 2013-2021 AsciiDoc.py Contributors. - -Free use of this software is granted under the terms of the GNU General -Public License version 2 (GPLv2). diff --git a/asciidoc/a2x.py b/asciidoc/a2x.py index 6cab06b..84a9334 100644 --- a/asciidoc/a2x.py +++ b/asciidoc/a2x.py @@ -4,6 +4,27 @@ a2x - A toolchain manager for AsciiDoc (converts Asciidoc text files to other file formats) +Please note, the a2x was originally licensed under the MIT license. Any changes +on or after 12/31/2021 are licensed under the GPLv2+. See below for licenses, and +due to sub-licensing, this file MUST carry both licenses unless all MIT code has +been rewritten. + +----- + +Copyright (C) 2021-2022 AsciiDoc Contributors. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +---- + Free use of this software is granted under the terms of the MIT license. Copyright (C) 2002-2013 Stuart Rackham. diff --git a/asciidoc/asciidoc.py b/asciidoc/asciidoc.py index 952d9bb..de79957 100644 --- a/asciidoc/asciidoc.py +++ b/asciidoc/asciidoc.py @@ -6,8 +6,13 @@ asciidoc - converts an AsciiDoc text file to HTML or DocBook Copyright (C) 2002-2013 Stuart Rackham. Copyright (C) 2013-2022 AsciiDoc Contributors. -Free use of this software is granted under the terms of the GNU General -Public License version 2 (GPLv2). +Free use of this software is granted under the terms of the GNU General Public +License as published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more details. """ # Please note, the contents of this module are considered "private" with the diff --git a/asciidoc/resources/filters/code/code-filter.py b/asciidoc/resources/filters/code/code-filter.py index fb6266b..db0c8cc 100755 --- a/asciidoc/resources/filters/code/code-filter.py +++ b/asciidoc/resources/filters/code/code-filter.py @@ -50,7 +50,13 @@ COPYING Copyright (C) 2013-2022 AsciiDoc Contributors. Free use of this software is granted under the terms of the GNU General - Public License version 2 (GPLv2). + Public License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. ''' import os diff --git a/asciidoc/resources/filters/graphviz/graphviz2png.py b/asciidoc/resources/filters/graphviz/graphviz2png.py index a13c67d..0b57a9f 100755 --- a/asciidoc/resources/filters/graphviz/graphviz2png.py +++ b/asciidoc/resources/filters/graphviz/graphviz2png.py @@ -48,8 +48,16 @@ THANKS LICENSE Copyright (C) 2008-2009 Gouichi Iisaka. - Free use of this software is granted under the terms of - the GNU General Public License (GPL). + Copyright (C) 2013-2022 AsciiDoc Contributors. + + Free use of this software is granted under the terms of the GNU General + Public License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. ''' import os diff --git a/asciidoc/resources/filters/latex/latex2img.py b/asciidoc/resources/filters/latex/latex2img.py index d969cdf..d57ab5e 100755 --- a/asciidoc/resources/filters/latex/latex2img.py +++ b/asciidoc/resources/filters/latex/latex2img.py @@ -58,7 +58,13 @@ COPYING Copyright (C) 2013-2022 AsciiDoc Contributors. Free use of this software is granted under the terms of the GNU General - Public License version 2 (GPLv2). + Public License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. ''' import os diff --git a/asciidoc/resources/filters/music/music2png.py b/asciidoc/resources/filters/music/music2png.py index 511db39..0598c5e 100755 --- a/asciidoc/resources/filters/music/music2png.py +++ b/asciidoc/resources/filters/music/music2png.py @@ -50,7 +50,13 @@ COPYING Copyright (C) 2013-2022 AsciiDoc Contributors. Free use of this software is granted under the terms of the GNU General - Public License version 2 (GPLv2). + Public License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. ''' import os diff --git a/asciidoc/resources/help.conf b/asciidoc/resources/help.conf index 20928e8..e908fac 100644 --- a/asciidoc/resources/help.conf +++ b/asciidoc/resources/help.conf @@ -197,7 +197,13 @@ COPYING Copyright (C) 2013-2022 AsciiDoc Contributors. Free use of this software is granted under the terms of the GNU General - Public License version 2 (GPLv2). + Public License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. [syntax] diff --git a/asciidoc/resources/lang-cs.conf b/asciidoc/resources/lang-cs.conf index ee4052c..1f0f240 100644 --- a/asciidoc/resources/lang-cs.conf +++ b/asciidoc/resources/lang-cs.conf @@ -1,7 +1,6 @@ # # AsciiDoc Czech language configuration file. -# (C) 2012 Petr Klíma -# License: GNU Free Documentation License, ver. 1.3 or later version, see http://fsf.org/ +# Originally written by Petr Klíma [attributes] # Left and right single and double quote characters. diff --git a/asciidoc/resources/lang-pl.conf b/asciidoc/resources/lang-pl.conf index 7bb6d87..4882df2 100644 --- a/asciidoc/resources/lang-pl.conf +++ b/asciidoc/resources/lang-pl.conf @@ -1,3 +1,6 @@ +# Note: This builtin file will be removed in asciidoc-py 11.0.0 due to licensing incompatibility. +# Currently, you can install this separately from https://github.com/asciidoc-py/extra-resources +# as a new delivery mechanism is worked out. # # AsciiDoc Polish language configuration file. # (C) 2015 Kerusey Karyu diff --git a/doc/a2x.1.txt b/doc/a2x.1.txt index cacb87d..ca76015 100644 --- a/doc/a2x.1.txt +++ b/doc/a2x.1.txt @@ -377,5 +377,12 @@ Copyright \(C) 2002-2013 Stuart Rackham. Copyright \(C) 2013-2022 AsciiDoc Contributors. -Free use of this software is granted under the terms of the MIT license. +Free use of this software is granted under the terms of the GNU General +Public License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. diff --git a/doc/asciidoc.1.txt b/doc/asciidoc.1.txt index 2447d5e..cf8134d 100644 --- a/doc/asciidoc.1.txt +++ b/doc/asciidoc.1.txt @@ -233,5 +233,11 @@ Copyright \(C) 2002-2013 Stuart Rackham. Copyright \(C) 2013-2022 AsciiDoc Contributors. Free use of this software is granted under the terms of the GNU General -Public License version 2 (GPLv2). +Public License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt index 5b92bae..6d506c2 100644 --- a/doc/asciidoc.txt +++ b/doc/asciidoc.txt @@ -6082,14 +6082,14 @@ used with the 'toc' attribute. Example usage: [appendix] License ------- -AsciiDoc is free software; you can redistribute it and/or modify it -under the terms of the 'GNU General Public License version 2' (GPLv2) -as published by the Free Software Foundation. - -AsciiDoc is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License version 2 for more details. +Free use of this software is granted under the terms of the GNU General +Public License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. Copyright (C) 2002-2013 Stuart Rackham. diff --git a/setup.py b/setup.py index 52b2384..e8abda2 100644 --- a/setup.py +++ b/setup.py @@ -82,12 +82,11 @@ setup( ], }, include_package_data=True, - license='GPLv2', + license='GPLv2+', classifiers=[ # Trove classifiers # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers - 'License :: OSI Approved :: GNU General Public License v2 (GPLv2)', - 'License :: OSI Approved :: MIT License', + 'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)', 'Programming Language :: Python', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.5', -- cgit v1.2.1