From 0cf284cf9cd23c57fcc2b9b0e95d484fd6792167 Mon Sep 17 00:00:00 2001 From: Bruce Cowan <bruce@bcowan.me.uk> Date: Sat, 3 Sep 2022 17:40:55 +0100 Subject: [PATCH] Replace CC0 with GPL3 --- .gitignore | 3 +- .gitlab-ci.yml | 2 +- LICENSES/CC0-1.0.txt | 119 ------------------------------- build-aux/uk.me.bcowan.Rugby.yml | 2 +- data/meson.build | 4 +- data/uk.me.bcowan.Rugby.desktop | 2 +- meson.build | 2 +- src/meson.build | 2 +- 8 files changed, 9 insertions(+), 127 deletions(-) delete mode 100644 LICENSES/CC0-1.0.txt diff --git a/.gitignore b/.gitignore index 18c1bf1..3d28c05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ # SPDX-FileCopyrightText: 2012-2017 Bruce Cowan <bruce@bcowan.me.uk> -# SPDX-License-Identifier: CC0-1.0 +# +# SPDX-License-Identifier: GPL-3.0-or-later .flatpak* diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c8e4a7..bb2150f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2018-2022 Bruce Cowan <bruce@bcowan.me.uk> # -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: GPL-3.0-or-later flatpak: image: alpine:latest stage: build diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt deleted file mode 100644 index a343ccd..0000000 --- a/LICENSES/CC0-1.0.txt +++ /dev/null @@ -1,119 +0,0 @@ -Creative Commons Legal Code - -CC0 1.0 Universal CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES -NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE -AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION -ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE -OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS -LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION -OR WORKS PROVIDED HEREUNDER. - -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer exclusive -Copyright and Related Rights (defined below) upon the creator and subsequent -owner(s) (each and all, an "owner") of an original work of authorship and/or -a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for the -purpose of contributing to a commons of creative, cultural and scientific -works ("Commons") that the public can reliably and without fear of later claims -of infringement build upon, modify, incorporate in other works, reuse and -redistribute as freely as possible in any form whatsoever and for any purposes, -including without limitation commercial purposes. These owners may contribute -to the Commons to promote the ideal of a free culture and the further production -of creative, cultural and scientific works, or to gain reputation or greater -distribution for their Work in part through the use and efforts of others. - -For these and/or other purposes and motivations, and without any expectation -of additional consideration or compensation, the person associating CC0 with -a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright -and Related Rights in the Work, voluntarily elects to apply CC0 to the Work -and publicly distribute the Work under its terms, with knowledge of his or -her Copyright and Related Rights in the Work and the meaning and intended -legal effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be protected -by copyright and related or neighboring rights ("Copyright and Related Rights"). -Copyright and Related Rights include, but are not limited to, the following: - -i. the right to reproduce, adapt, distribute, perform, display, communicate, -and translate a Work; - - ii. moral rights retained by the original author(s) and/or performer(s); - -iii. publicity and privacy rights pertaining to a person's image or likeness -depicted in a Work; - -iv. rights protecting against unfair competition in regards to a Work, subject -to the limitations in paragraph 4(a), below; - -v. rights protecting the extraction, dissemination, use and reuse of data -in a Work; - -vi. database rights (such as those arising under Directive 96/9/EC of the -European Parliament and of the Council of 11 March 1996 on the legal protection -of databases, and under any national implementation thereof, including any -amended or successor version of such directive); and - -vii. other similar, equivalent or corresponding rights throughout the world -based on applicable law or treaty, and any national implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention of, -applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and -unconditionally waives, abandons, and surrenders all of Affirmer's Copyright -and Related Rights and associated claims and causes of action, whether now -known or unknown (including existing as well as future claims and causes of -action), in the Work (i) in all territories worldwide, (ii) for the maximum -duration provided by applicable law or treaty (including future time extensions), -(iii) in any current or future medium and for any number of copies, and (iv) -for any purpose whatsoever, including without limitation commercial, advertising -or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the -benefit of each member of the public at large and to the detriment of Affirmer's -heirs and successors, fully intending that such Waiver shall not be subject -to revocation, rescission, cancellation, termination, or any other legal or -equitable action to disrupt the quiet enjoyment of the Work by the public -as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason be -judged legally invalid or ineffective under applicable law, then the Waiver -shall be preserved to the maximum extent permitted taking into account Affirmer's -express Statement of Purpose. In addition, to the extent the Waiver is so -judged Affirmer hereby grants to each affected person a royalty-free, non -transferable, non sublicensable, non exclusive, irrevocable and unconditional -license to exercise Affirmer's Copyright and Related Rights in the Work (i) -in all territories worldwide, (ii) for the maximum duration provided by applicable -law or treaty (including future time extensions), (iii) in any current or -future medium and for any number of copies, and (iv) for any purpose whatsoever, -including without limitation commercial, advertising or promotional purposes -(the "License"). The License shall be deemed effective as of the date CC0 -was applied by Affirmer to the Work. Should any part of the License for any -reason be judged legally invalid or ineffective under applicable law, such -partial invalidity or ineffectiveness shall not invalidate the remainder of -the License, and in such case Affirmer hereby affirms that he or she will -not (i) exercise any of his or her remaining Copyright and Related Rights -in the Work or (ii) assert any associated claims and causes of action with -respect to the Work, in either case contrary to Affirmer's express Statement -of Purpose. - - 4. Limitations and Disclaimers. - -a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, -licensed or otherwise affected by this document. - -b. Affirmer offers the Work as-is and makes no representations or warranties -of any kind concerning the Work, express, implied, statutory or otherwise, -including without limitation warranties of title, merchantability, fitness -for a particular purpose, non infringement, or the absence of latent or other -defects, accuracy, or the present or absence of errors, whether or not discoverable, -all to the greatest extent permissible under applicable law. - -c. Affirmer disclaims responsibility for clearing rights of other persons -that may apply to the Work or any use thereof, including without limitation -any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims -responsibility for obtaining any necessary consents, permissions or other -rights required for any use of the Work. - -d. Affirmer understands and acknowledges that Creative Commons is not a party -to this document and has no duty or obligation with respect to this CC0 or -use of the Work. diff --git a/build-aux/uk.me.bcowan.Rugby.yml b/build-aux/uk.me.bcowan.Rugby.yml index 016f8db..d072d40 100644 --- a/build-aux/uk.me.bcowan.Rugby.yml +++ b/build-aux/uk.me.bcowan.Rugby.yml @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2018-2022 Bruce Cowan <bruce@bcowan.me.uk> # -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: GPL-3.0-or-later app-id: uk.me.bcowan.Rugby runtime: org.gnome.Platform diff --git a/data/meson.build b/data/meson.build index 0c3a86c..9dc5c0a 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,6 +1,6 @@ -# SPDX-FileCopyrightText: 2016-2021 Bruce Cowan <bruce@bcowan.me.uk> +# SPDX-FileCopyrightText: 2016-2022 Bruce Cowan <bruce@bcowan.me.uk> # -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: GPL-3.0-or-later resources = gnome.compile_resources('gen-resources', 'rugby.gresource.xml', diff --git a/data/uk.me.bcowan.Rugby.desktop b/data/uk.me.bcowan.Rugby.desktop index db96ee0..679b1e4 100644 --- a/data/uk.me.bcowan.Rugby.desktop +++ b/data/uk.me.bcowan.Rugby.desktop @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2020-2021 Bruce Cowan <bruce@bcowan.me.uk> # -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: GPL-3.0-or-later [Desktop Entry] Name=Rugby diff --git a/meson.build b/meson.build index 855da3e..8b55387 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2016-2022 Bruce Cowan <bruce@bcowan.me.uk> # -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: GPL-3.0-or-later project('rugby', 'c', version: '0.3.0', diff --git a/src/meson.build b/src/meson.build index c280d96..679d975 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2016-2022 Bruce Cowan <bruce@bcowan.me.uk> # -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: GPL-3.0-or-later sources = [ 'main.c', 'rugby-app-window.c', -- GitLab