From 6371668dddf7a3196de7e2ecff4c4cac7ffa0e51 Mon Sep 17 00:00:00 2001 From: psvenk Date: Wed, 29 Sep 2021 18:40:23 -0400 Subject: [PATCH] Clarify license to be GPLv3+ (#282) Because Aspine has multiple contributors, this change does not go into effect until it is approved by all copyright holders who have contributed prior to October 23, 2020, and is merged into the master branch. --- README.md | 24 +++++++++++++----------- package-lock.json | 3 ++- package.json | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 783ee696..e3db0639 100755 --- a/README.md +++ b/README.md @@ -176,14 +176,16 @@ Copyright [Aspine contributors](https://github.com/Aspine/aspine/graphs/contributors) 2019–21. -This software is licensed under the GNU General Public License, version 3 -— see the [LICENSE.md](LICENSE.md) file for details. - -If you contribute to Aspine, please note that you are consenting to having your -contributions released under the terms of this license. For any contributions -dated on or after October 23, 2020, you also consent to having your -contributions be released under any earlier or later version of the GNU General -Public License, as published by the Free Software Foundation, if and when the -licensing terms for Aspine are changed to allow such version(s). (For more -information about the rationale behind this clause, please read issue -[#38](https://github.com/Aspine/aspine/issues/38).) +Aspine is [free/libre](https://www.gnu.org/philosophy/free-sw.html) and +[open-source](https://opensource.org/osd) 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 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. + +You should have received a copy of the GNU General Public License (version 3) +along with this program (see file `LICENSE.md`). If not, see +. diff --git a/package-lock.json b/package-lock.json index 74302552..16ab6c6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,8 +5,9 @@ "requires": true, "packages": { "": { + "name": "aspine", "version": "2.8.1", - "license": "GPL-3.0-only", + "license": "GPL-3.0-or-later", "dependencies": { "@fortawesome/fontawesome-free": "^5.15.3", "@iarna/toml": "^3.0.0", diff --git a/package.json b/package.json index ff682a47..76b7aa08 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "bugs": { "url": "https://github.com/maxtkc/aspine/issues" }, - "license": "GPL-3.0-only", + "license": "GPL-3.0-or-later", "contributors": [ "Max Katz-Christy", "Cole Killian",