Did you get agreement from the more than 100 copyright holders to do this? Cheers, Albert
El dissabte, 30 de gener de 2021, a les 20:39:11 CET, Johnny Jazeix va escriure: > Git commit 914363f5b648d83bde35a2018ec9cf6744a80911 by Johnny Jazeix. > Committed on 30/01/2021 at 19:38. > Pushed by jjazeix into branch 'KDE/1.0'. > > docs, relicence GCompris executable as AGPLv3 due to analog electricity engine > > M +67 -80 COPYING > C +0 -0 COPYING-GPLv3 [from: COPYING - 100% similarity] > M +1 -1 README.md > M +1 -1 docs/docbook/index.docbook > M +1 -1 docs/manual-general > M +1 -1 org.kde.gcompris.appdata.xml > M +1 -1 platforms/sailfishOS/harbour-gcompris-qt.spec.cmake > M +1 -1 publiccode.yml > M +2 -2 src/core/CMakeLists.txt > > https://invent.kde.org/education/gcompris/commit/914363f5b648d83bde35a2018ec9cf6744a80911 > > diff --git a/COPYING b/COPYING > index e60008693..be3f7b28e 100644 > --- a/COPYING > +++ b/COPYING > @@ -1,5 +1,5 @@ > - GNU GENERAL PUBLIC LICENSE > - Version 3, 29 June 2007 > + GNU AFFERO GENERAL PUBLIC LICENSE > + Version 3, 19 November 2007 > > Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> > Everyone is permitted to copy and distribute verbatim copies > @@ -7,17 +7,15 @@ > > Preamble > > - The GNU General Public License is a free, copyleft license for > -software and other kinds of works. > + The GNU Affero General Public License is a free, copyleft license for > +software and other kinds of works, specifically designed to ensure > +cooperation with the community in the case of network server software. > > The licenses for most software and other practical works are designed > to take away your freedom to share and change the works. By contrast, > -the GNU General Public License is intended to guarantee your freedom to > +our General Public Licenses are intended to guarantee your freedom to > share and change all versions of a program--to make sure it remains free > -software for all its users. We, the Free Software Foundation, use the > -GNU General Public License for most of our software; it applies also to > -any other work released this way by its authors. You can apply it to > -your programs, too. > +software for all its users. > > When we speak of free software, we are referring to freedom, not > price. Our General Public Licenses are designed to make sure that you > @@ -26,44 +24,34 @@ them if you wish), that you receive source code or can > get it if you > want it, that you can change the software or use pieces of it in new > free programs, and that you know you can do these things. > > - To protect your rights, we need to prevent others from denying you > -these rights or asking you to surrender the rights. Therefore, you have > -certain responsibilities if you distribute copies of the software, or if > -you modify it: responsibilities to respect the freedom of others. > - > - For example, if you distribute copies of such a program, whether > -gratis or for a fee, you must pass on to the recipients the same > -freedoms that you received. You must make sure that they, too, receive > -or can get the source code. And you must show them these terms so they > -know their rights. > - > - Developers that use the GNU GPL protect your rights with two steps: > -(1) assert copyright on the software, and (2) offer you this License > -giving you legal permission to copy, distribute and/or modify it. > - > - For the developers' and authors' protection, the GPL clearly explains > -that there is no warranty for this free software. For both users' and > -authors' sake, the GPL requires that modified versions be marked as > -changed, so that their problems will not be attributed erroneously to > -authors of previous versions. > - > - Some devices are designed to deny users access to install or run > -modified versions of the software inside them, although the manufacturer > -can do so. This is fundamentally incompatible with the aim of > -protecting users' freedom to change the software. The systematic > -pattern of such abuse occurs in the area of products for individuals to > -use, which is precisely where it is most unacceptable. Therefore, we > -have designed this version of the GPL to prohibit the practice for those > -products. If such problems arise substantially in other domains, we > -stand ready to extend this provision to those domains in future versions > -of the GPL, as needed to protect the freedom of users. > - > - Finally, every program is threatened constantly by software patents. > -States should not allow patents to restrict development and use of > -software on general-purpose computers, but in those that do, we wish to > -avoid the special danger that patents applied to a free program could > -make it effectively proprietary. To prevent this, the GPL assures that > -patents cannot be used to render the program non-free. > + Developers that use our General Public Licenses protect your rights > +with two steps: (1) assert copyright on the software, and (2) offer > +you this License which gives you legal permission to copy, distribute > +and/or modify the software. > + > + A secondary benefit of defending all users' freedom is that > +improvements made in alternate versions of the program, if they > +receive widespread use, become available for other developers to > +incorporate. Many developers of free software are heartened and > +encouraged by the resulting cooperation. However, in the case of > +software used on network servers, this result may fail to come about. > +The GNU General Public License permits making a modified version and > +letting the public access it on a server without ever releasing its > +source code to the public. > + > + The GNU Affero General Public License is designed specifically to > +ensure that, in such cases, the modified source code becomes available > +to the community. It requires the operator of a network server to > +provide the source code of the modified version running there to the > +users of that server. Therefore, public use of a modified version, on > +a publicly accessible server, gives the public access to the source > +code of the modified version. > + > + An older license, called the Affero General Public License and > +published by Affero, was designed to accomplish similar goals. This is > +a different license, not a version of the Affero GPL, but Affero has > +released a new version of the Affero GPL which permits relicensing under > +this license. > > The precise terms and conditions for copying, distribution and > modification follow. > @@ -72,7 +60,7 @@ modification follow. > > 0. Definitions. > > - "This License" refers to version 3 of the GNU General Public License. > + "This License" refers to version 3 of the GNU Affero General Public > License. > > "Copyright" also means copyright-like laws that apply to other kinds of > works, such as semiconductor masks. > @@ -549,35 +537,45 @@ to collect a royalty for further conveying from those > to whom you convey > the Program, the only way you could satisfy both those terms and this > License would be to refrain entirely from conveying the Program. > > - 13. Use with the GNU Affero General Public License. > + 13. Remote Network Interaction; Use with the GNU General Public License. > + > + Notwithstanding any other provision of this License, if you modify the > +Program, your modified version must prominently offer all users > +interacting with it remotely through a computer network (if your version > +supports such interaction) an opportunity to receive the Corresponding > +Source of your version by providing access to the Corresponding Source > +from a network server at no charge, through some standard or customary > +means of facilitating copying of software. This Corresponding Source > +shall include the Corresponding Source for any work covered by version 3 > +of the GNU General Public License that is incorporated pursuant to the > +following paragraph. > > Notwithstanding any other provision of this License, you have > permission to link or combine any covered work with a work licensed > -under version 3 of the GNU Affero General Public License into a single > +under version 3 of the GNU General Public License into a single > combined work, and to convey the resulting work. The terms of this > License will continue to apply to the part which is the covered work, > -but the special requirements of the GNU Affero General Public License, > -section 13, concerning interaction through a network will apply to the > -combination as such. > +but the work with which it is combined will remain governed by version > +3 of the GNU General Public License. > > 14. Revised Versions of this License. > > The Free Software Foundation may publish revised and/or new versions of > -the GNU General Public License from time to time. Such new versions will > -be similar in spirit to the present version, but may differ in detail to > +the GNU Affero General Public License from time to time. Such new versions > +will be similar in spirit to the present version, but may differ in detail to > address new problems or concerns. > > Each version is given a distinguishing version number. If the > -Program specifies that a certain numbered version of the GNU General > +Program specifies that a certain numbered version of the GNU Affero General > Public License "or any later version" applies to it, you have the > option of following the terms and conditions either of that numbered > version or of any later version published by the Free Software > Foundation. If the Program does not specify a version number of the > -GNU General Public License, you may choose any version ever published > +GNU Affero General Public License, you may choose any version ever published > by the Free Software Foundation. > > If the Program specifies that a proxy can decide which future > -versions of the GNU General Public License can be used, that proxy's > +versions of the GNU Affero General Public License can be used, that proxy's > public statement of acceptance of a version permanently authorizes you > to choose that version for the Program. > > @@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full > notice is found. > Copyright (C) <year> <name of author> > > 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 > + it under the terms of the GNU Affero General Public License as published > by > the Free Software Foundation, either version 3 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. > + GNU Affero General Public License for more details. > > - You should have received a copy of the GNU General Public License > + You should have received a copy of the GNU Affero General Public License > along with this program. If not, see <https://www.gnu.org/licenses/>. > > Also add information on how to contact you by electronic and paper mail. > > - If the program does terminal interaction, make it output a short > -notice like this when it starts in an interactive mode: > - > - <program> Copyright (C) <year> <name of author> > - This program comes with ABSOLUTELY NO WARRANTY; for details type `show > w'. > - This is free software, and you are welcome to redistribute it > - under certain conditions; type `show c' for details. > - > -The hypothetical commands `show w' and `show c' should show the appropriate > -parts of the General Public License. Of course, your program's commands > -might be different; for a GUI interface, you would use an "about box". > + If your software can interact with users remotely through a computer > +network, you should also make sure that it provides a way for users to > +get its source. For example, if your program is a web application, its > +interface could display a "Source" link that leads users to an archive > +of the code. There are many ways you could offer source, and different > +solutions will be better for different programs; see section 13 for the > +specific requirements. > > You should also get your employer (if you work as a programmer) or school, > if any, to sign a "copyright disclaimer" for the program, if necessary. > -For more information on this, and how to apply and follow the GNU GPL, see > +For more information on this, and how to apply and follow the GNU AGPL, see > <https://www.gnu.org/licenses/>. > - > - The GNU General Public License does not permit incorporating your program > -into proprietary programs. If your program is a subroutine library, you > -may consider it more useful to permit linking proprietary applications with > -the library. If this is what you want to do, use the GNU Lesser General > -Public License instead of this License. But first, please read > -<https://www.gnu.org/philosophy/why-not-lgpl.html>. > diff --git a/COPYING b/COPYING-GPLv3 > similarity index 100% > copy from COPYING > copy to COPYING-GPLv3 > diff --git a/README.md b/README.md > index 9a4b0c16b..d8419dd36 100644 > --- a/README.md > +++ b/README.md > @@ -48,4 +48,4 @@ Bug reports should be created in the [KDE bug > tracker](https://bugs.kde.org/ente > > ## Licence > > -GCompris is free software released under the [GPL > V3+](https://www.gnu.org/licenses/gpl-3.0.fr.html). > +GCompris is free software released under the [AGPL > v3](https://www.gnu.org/licenses/agpl-3.0.html). All the internal code is > under [GPL V3+](https://www.gnu.org/licenses/gpl-3.0.html) but we use a > library for [analog electricity > activity](https://github.com/edx/edx-platform/blob/master/common/lib/xmodule/xmodule/js/src/capa/schematic.js) > under AGPL 3.0 causing the whole software to be licenced under it. > diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook > index a042f3fea..d4e40abe1 100644 > --- a/docs/docbook/index.docbook > +++ b/docs/docbook/index.docbook > @@ -72,7 +72,7 @@ for example 'xx.yy.zz' > <para>&gcompris; is a rich educational software suite which contains a wide > range of activities.</para> > <para>It offers various activities aimed at covering a variety of fields. > The topics include reading and typing, arithmetics, geography, sciences, and > other topics. It is meant to be used both at home and at school.</para> > <para>The purpose of &gcompris; is to provide playful activities but always > educational.</para> > -<para>&gcompris; is part of &kde; project and is placed under the <ulink > url="https://www.gnu.org/licenses/gpl.html";>GPLv3 license</ulink>.</para> > +<para>&gcompris; is part of &kde; project and is placed under the <ulink > url="https://www.gnu.org/licenses/agpl-3.0.html";>AGPLv3 license</ulink>. All > the code, except the engine for analog electricity activity is under <ulink > url="https://www.gnu.org/licenses/gpl.html";>GPLv3 license</ulink>.</para> > <para>&gcompris; is available on the following operating systems: > &GNU;/&Linux;, &BSD;, MacOSX, &Windows;, Android. > It requires a 3D card with support of <emphasis>OpenGL 2.1</emphasis> or > higher is required. 32 bits color depth mandatory</para> > </sect1> > diff --git a/docs/manual-general b/docs/manual-general > index 4ed61817d..0849d1813 100644 > --- a/docs/manual-general > +++ b/docs/manual-general > @@ -21,7 +21,7 @@ In GCompris all the activities follow the same core values: > > ***Distribution > > -The source code of GCompris is under GNU GPLv3, it is free software. It runs > best on Free-Software operating systems like GNU/Linux. > +The source code of GCompris is under GNU GPLv3, except for the engine of > analog electricity which is under GNU AGPLv3, causing the whole software to > be licensed under GNU AGPLv3. It is free software. It runs best on > Free-Software operating systems like GNU/Linux. > > We also support proprietary operating systems, OSX, Windows and Android. For > Android, you can get it either from the F-Droid store or the Google Play > Store. > > diff --git a/org.kde.gcompris.appdata.xml b/org.kde.gcompris.appdata.xml > index f3cb7782f..460a7a193 100644 > --- a/org.kde.gcompris.appdata.xml > +++ b/org.kde.gcompris.appdata.xml > @@ -2,7 +2,7 @@ > <component type="desktop"> > <id>org.kde.gcompris.desktop</id> > <metadata_license>CC0-1.0</metadata_license> > - <project_license>GPL-3.0+</project_license> > + <project_license>AGPL-3.0</project_license> > <name>GCompris</name> > <name xml:lang="br">GCompris</name> > <name xml:lang="ca">GCompris</name> > diff --git a/platforms/sailfishOS/harbour-gcompris-qt.spec.cmake > b/platforms/sailfishOS/harbour-gcompris-qt.spec.cmake > index fa4818a63..157c4a8be 100644 > --- a/platforms/sailfishOS/harbour-gcompris-qt.spec.cmake > +++ b/platforms/sailfishOS/harbour-gcompris-qt.spec.cmake > @@ -3,7 +3,7 @@ Summary: gcompris-qt > Name: @GCOMPRIS_EXECUTABLE_NAME@ > Version: @GCOMPRIS_MAJOR_VERSION@.@GCOMPRIS_MINOR_VERSION@ > Release: 1 > -License: GPLv3 > +License: AGPL-3.0 > Group: GCompris > Url: https://www.gcompris.org > > diff --git a/publiccode.yml b/publiccode.yml > index 52f9d05e4..fca77096c 100644 > --- a/publiccode.yml > +++ b/publiccode.yml > @@ -30,7 +30,7 @@ maintenance: > - name: Johnny Jazeix > email: [email protected] > legal: > - license: GPL-3.0-or-later > + license: AGPL-3.0 > localisation: > localisationReady: true > availableLanguages: > diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt > index 9c647a81a..9b82c0147 100644 > --- a/src/core/CMakeLists.txt > +++ b/src/core/CMakeLists.txt > @@ -180,7 +180,7 @@ if(BUILD_STANDALONE) > MACOSX_BUNDLE_BUNDLE_NAME "gcompris-qt" > MACOSX_BUNDLE_SHORT_VERSION_STRING "${GCOMPRIS_VERSION}" > MACOSX_BUNDLE_BUNDLE_VERSION "${GCOMPRIS_VERSION}" > - MACOSX_BUNDLE_COPYRIGHT "GPL License, Copyright 2000-2019 Timothee > Giet and Others.") > + MACOSX_BUNDLE_COPYRIGHT "AGPL-3.0 License, SPDX-FileCopyrightText: > 2000-2021 Timothee Giet and Others.") > set_source_files_properties(${GCOMPRIS_RESOURCES}/${gcompris_icon} > PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") > else() > set(_qtconf_destdir bin) > @@ -353,7 +353,7 @@ elseif(SAILFISHOS) > set(CPACK_RPM_PACKAGE_ARCHITECTURE "${BUILD_ARCH}") > set(CPACK_RPM_PACKAGE_NAME "${GCOMPRIS_EXECUTABLE_NAME}") > set(CPACK_RPM_PACKAGE_VERSION "${GCOMPRIS_VERSION}") > - set(CPACK_RPM_PACKAGE_LICENSED "GPLv3") > + set(CPACK_RPM_PACKAGE_LICENSE "GNU Affero General Public License v3.0") > set(CPACK_RPM_PACKAGE_URL "https://www.gcompris.org";) > set(CPACK_RPM_PACKAGE_DESCRIPTION "GCompris is a high quality educational > software suite comprising of numerous activities for children aged 2 to 10.") > set(CPACK_RPM_USER_BINARY_SPECFILE > "${CMAKE_BINARY_DIR}/harbour-gcompris-qt.spec") >
