Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] data/glep:master commit in: /
Date: Sun, 10 Jun 2018 18:43:03
Message-Id: 1528656127.b6c93aafaf661661b4458c6cfb3963de2eb154c6.ulm@gentoo
1 commit: b6c93aafaf661661b4458c6cfb3963de2eb154c6
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 10 20:54:36 2018 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 10 18:42:07 2018 +0000
6 URL: https://gitweb.gentoo.org/data/glep.git/commit/?id=b6c93aaf
7
8 glep-0076: Mention only CC-BY-SA for the Linux DCO.
9
10 That it is also distributed under GPL-2 now is not relevant, as it
11 would not allow us to distribute our derived version under CC-BY-SA.
12
13 glep-0076.rst | 10 ++--------
14 1 file changed, 2 insertions(+), 8 deletions(-)
15
16 diff --git a/glep-0076.rst b/glep-0076.rst
17 index b15389b..cb4b1a6 100644
18 --- a/glep-0076.rst
19 +++ b/glep-0076.rst
20 @@ -8,7 +8,7 @@ Type: Informational
21 Status: Draft
22 Version: 1
23 Created: 2013-04-23
24 -Last-Modified: 2018-02-01
25 +Last-Modified: 2018-02-10
26 Post-History:
27 Content-Type: text/x-rst
28 ---
29 @@ -114,9 +114,7 @@ The following is the current Gentoo DCO 1.0::
30 The Gentoo DCO is licensed under a Creative Commons
31 Attribution-ShareAlike 3.0 Unported License [#CC-BY-SA-3.0]_.
32 It is based on the Linux Kernel DCO [#OSDL-DCO]_, released by Open
33 -Source Development Labs, Inc. in 2005 under a CC-BY-SA-2.5 License,
34 -and distributed by the Linux Foundation as part of the kernel source
35 -tree [#SUBMITTING-PATCHES]_ under GPL-2.
36 +Source Development Labs, Inc. in 2005 under a CC-BY-SA-2.5 License.
37
38
39 Copyright Attribution
40 @@ -190,10 +188,6 @@ References
41 .. [#OSDL-DCO] Developer's Certificate of Origin 1.1,
42 https://web.archive.org/web/20060524185355/http://www.osdlab.org/newsroom/press_releases/2004/2004_05_24_dco.html
43
44 -.. [#SUBMITTING-PATCHES] Submitting patches: the essential guide to
45 - getting your code into the kernel,
46 - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst
47 -
48 .. [#FLA] Gentoo Fiduciary License Agreement,
49 https://dev.gentoo.org/~rich0/fla.pdf