From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D3F95138334 for ; Fri, 31 Aug 2018 14:57:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2972E085E; Fri, 31 Aug 2018 14:57:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBB8DE085E for ; Fri, 31 Aug 2018 14:57:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9212E335CDD for ; Fri, 31 Aug 2018 14:57:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FDC03C0 for ; Fri, 31 Aug 2018 14:57:14 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1535726447.14c70ff37afffa0e96215cdb5e68c38a2be8414e.ulm@gentoo> Subject: [gentoo-commits] data/glep:master commit in: / X-VCS-Repository: data/glep X-VCS-Files: glep-0076.rst X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 14c70ff37afffa0e96215cdb5e68c38a2be8414e X-VCS-Branch: master Date: Fri, 31 Aug 2018 14:57:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d59cda40-788e-430f-a108-ae1d65108681 X-Archives-Hash: 94bb07272500806a9ad6f11dbae2c278 commit: 14c70ff37afffa0e96215cdb5e68c38a2be8414e Author: Ulrich Müller gentoo org> AuthorDate: Sat Jun 23 21:32:16 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Aug 31 14:40:47 2018 +0000 URL: https://gitweb.gentoo.org/data/glep.git/commit/?id=14c70ff3 glep-0076: Require CC-BY-SA-4.0 for new projects. glep-0076.rst | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/glep-0076.rst b/glep-0076.rst index b1ab066..3ab59a6 100644 --- a/glep-0076.rst +++ b/glep-0076.rst @@ -108,9 +108,9 @@ following: a) The GNU General Public License, version 2 or later (GPL-2+) [#GPL-2]_. -b) The Creative Commons Attribution-ShareAlike 3.0 License - (CC-BY-SA-3.0, only for documentation) [#CC-BY-SA-3.0]_. - *[Note: or version 4.0, to be decided]* +b) The Creative Commons Attribution-ShareAlike 4.0 License + (CC-BY-SA-4.0, only for documentation) [#CC-BY-SA-4.0]_. + Existing projects may also stay with CC-BY-SA-3.0 [#CC-BY-SA-3.0]_. c) A license approved as GPL compatible by the Free Software Foundation [#GPL-COMPAT]_. @@ -244,7 +244,7 @@ The Social Contract mentions GPL-2 and CC-BY-SA-2.0, both with the option to use them in a later version ("at our discretion"). In order to facilitate interchange of software between different projects, we aim for uniformity of their licensing. Therefore, items a) and b) -explicitly recommend the use of GPL-2+ and CC-BY-SA-3.0. The latter +explicitly recommend the use of GPL-2+ and CC-BY-SA-4.0. The latter is restricted to be used for documentation, because Creative Commons themselves recommend against using their licenses for software [#CC-SOFTWARE]_. @@ -332,6 +332,9 @@ References .. [#GPL-2] GNU General Public License, version 2 or later, https://www.gnu.org/licenses/gpl-2.0.html +.. [#CC-BY-SA-4.0] Creative Commons Attribution-ShareAlike 4.0 + International License, https://creativecommons.org/licenses/by-sa/4.0/ + .. [#CC-BY-SA-3.0] Creative Commons Attribution-ShareAlike 3.0 Unported License, https://creativecommons.org/licenses/by-sa/3.0/