diff options
author | ng0 <ng0@n0.is> | 2019-03-14 17:01:39 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-03-14 17:01:39 +0000 |
commit | 46c40183ab0d611186043f3ac0404495b9e55853 (patch) | |
tree | 3fb1938c4830e97e22876a45269ea2570a41844f | |
parent | 4e000ef3c2e90f02bf693d8771f6ad77d93a87a5 (diff) | |
download | gnunet-ev-46c40183ab0d611186043f3ac0404495b9e55853.tar.gz gnunet-ev-46c40183ab0d611186043f3ac0404495b9e55853.zip |
copyright.tex: It is factually incorrect to point out the GPL3 for
the main gnunet repository since we switched over to AGPLv3+.
We should probably add a sentence to explain the diff between old
license agreements and new ones.
-rw-r--r-- | copyright.tex | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/copyright.tex b/copyright.tex index c77aaa4..3568c60 100644 --- a/copyright.tex +++ b/copyright.tex | |||
@@ -1,5 +1,8 @@ | |||
1 | % | 1 | % |
2 | % Copyright assignment to GNUnet e.V. in der Fassung vom 20.1.2016 | 2 | % Copyright assignment to GNUnet e.V. in der Fassung vom 20.1.2016 |
3 | % Inhaltliche Korrekturen von ng0 bis zum 14.03 2019: | ||
4 | % - URL changes (git repository location) | ||
5 | % - Lizenzaenderung (GPL3 -> AGPL3) | ||
3 | % | 6 | % |
4 | \documentclass[a4paper]{article} %,titlepage | 7 | \documentclass[a4paper]{article} %,titlepage |
5 | %\documentclass{article} | 8 | %\documentclass{article} |
@@ -95,7 +98,7 @@ hereinafter referred to as {\bf ``the Contributor''}. | |||
95 | \begin{itemize} | 98 | \begin{itemize} |
96 | \item That the GNUnet project is directed and supported by GNUnet e.V., | 99 | \item That the GNUnet project is directed and supported by GNUnet e.V., |
97 | which aims to develop the GNUnet software as part of the GNU project, | 100 | which aims to develop the GNUnet software as part of the GNU project, |
98 | distributed under license GNU GPL v3+ on the date of signing of this | 101 | distributed under license GNU AGPL v3+ on the date of signing of this |
99 | contract; | 102 | contract; |
100 | \item That this development project is opened to contributions | 103 | \item That this development project is opened to contributions |
101 | submitted by individuals outside of GNUnet e.V., contributions which | 104 | submitted by individuals outside of GNUnet e.V., contributions which |
@@ -119,7 +122,7 @@ hereinafter referred to as {\bf ``the Contributor''}. | |||
119 | \begin{itemize} | 122 | \begin{itemize} |
120 | \item {\bf ``Software'':} means the GNUnet software available at | 123 | \item {\bf ``Software'':} means the GNUnet software available at |
121 | {\tt https://git.gnunet.org/} and on GNU's FTP mirrors, in its | 124 | {\tt https://git.gnunet.org/} and on GNU's FTP mirrors, in its |
122 | present version and future versions, distributed under the GNU GPL | 125 | present version and future versions, distributed under the GNU AGPL |
123 | v3 license at the date of the signing of this contract, or any | 126 | v3 license at the date of the signing of this contract, or any |
124 | other license chosen by GNUnet e.V. | 127 | other license chosen by GNUnet e.V. |
125 | \end{itemize} | 128 | \end{itemize} |
@@ -127,7 +130,7 @@ hereinafter referred to as {\bf ``the Contributor''}. | |||
127 | However, ``Software'' does not mean the versions derived from the | 130 | However, ``Software'' does not mean the versions derived from the |
128 | Software, developed and distributed by the Contributor, independently | 131 | Software, developed and distributed by the Contributor, independently |
129 | of the successive versions edited and distributed by GNUnet e.V., in | 132 | of the successive versions edited and distributed by GNUnet e.V., in |
130 | accordance with the rights granted to the Contributor by the GNU GPL | 133 | accordance with the rights granted to the Contributor by the GNU AGPL |
131 | v3+ license. | 134 | v3+ license. |
132 | 135 | ||
133 | \begin{itemize} | 136 | \begin{itemize} |
@@ -219,14 +222,14 @@ to GNUnet e.V. for as long as said copyrights last. | |||
219 | promises to ensure that all participation by its employees in the | 222 | promises to ensure that all participation by its employees in the |
220 | development of the Software ceases. | 223 | development of the Software ceases. |
221 | \item The Contributor and its employees nevertheless remain free to | 224 | \item The Contributor and its employees nevertheless remain free to |
222 | use the Software under the conditions provided for by the GNU GPL | 225 | use the Software under the conditions provided for by the GNU AGPL |
223 | v3 license or any other license which may subsequently become | 226 | v3 license or any other license which may subsequently become |
224 | attached to it. | 227 | attached to it. |
225 | \item The assignment is non-exclusive. In particular, the | 228 | \item The assignment is non-exclusive. In particular, the |
226 | Contributor remains free to make the same Contributions to other | 229 | Contributor remains free to make the same Contributions to other |
227 | projects and under other licenses. However, this exception only | 230 | projects and under other licenses. However, this exception only |
228 | applies to the Contribution, and in particular does not relieve | 231 | applies to the Contribution, and in particular does not relieve |
229 | the Contributor from the obligations of the GNU GPLv3+ or other | 232 | the Contributor from the obligations of the GNU AGPLv3+ or other |
230 | licenses of the Software, in cases where these licenses may | 233 | licenses of the Software, in cases where these licenses may |
231 | otherwise apply to the Contribution. | 234 | otherwise apply to the Contribution. |
232 | \item GNUnet e.V. remains free to terminate the submission of | 235 | \item GNUnet e.V. remains free to terminate the submission of |