summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-06-22 10:56:20 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-06-22 10:56:20 -0300
commit89fca7f40c20612bf94fb7721185e0d4f083f2e2 (patch)
treef537ba78098ad24b3f32accc793a064bb62c2b75
parent5035816cde7eb05e83d165bb9d7f6a4312398f61 (diff)
fixing derivation and fdl on COPYING file
-rw-r--r--COPYING19
1 files changed, 13 insertions, 6 deletions
diff --git a/COPYING b/COPYING
index ed290c7..3a5c1d1 100644
--- a/COPYING
+++ b/COPYING
@@ -3,12 +3,19 @@ POM - Parabola Official Multimedia
-----------------------------------------------------------------------------------------------------------
-ATTRIBUTIONS:
+ATTRIBUTIONS: DESCRIPTION:
Crazytoon <crazytoon@parabola.nu>
coadde <coadde@parabola.nu>
-Shackra <elcorreo@deshackra.com> (Parabola official logotype - 2013)
Catira <catira@riseup.net> (clean-up and painting of some images)
+DERIVATIONS: DESCRIPTION:
+Shackra <elcorreo@deshackra.com> (Parabola official logotype - 2013,
+ all files with this derivation have been changed such
+ as color, size and/or design)
+lukeshu <lukeshu@sbcglobal.net> (Parabola classic logotype - 2009-2012?,
+ all files with this derivation have been changed such
+ as color, size and/or design)
+
-----------------------------------------------------------------------------------------------------------
It's official collections of multimedia files from Parabola project (https://parabola.nu).
@@ -27,7 +34,8 @@ b) the Creative Commons Attribution-ShareAlike 4.0 International License as publ
(read "COPYING_CCBYSA_V4_0" or "http://creativecommons.org/licenses/by-sa/4.0/"), or
c) the GNU Free Documentation License as published by the Free Software Foundation;
- either version 1.3, or (at your option) any later version
+ either version 1.3, or (at your option) any later version;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts;
(read "COPYING_FDL_V1_3" or "http://gnu.org/licenses/fdl-1.3.html")
-----------------------------------------------------------------------------------------------------------
@@ -44,7 +52,8 @@ b) the Creative Commons Attribution-ShareAlike 4.0 International License as publ
(read "COPYING_CCBYSA_V4_0" or "http://creativecommons.org/licenses/by-sa/4.0/"), or
c) the GNU Free Documentation License as published by the Free Software Foundation;
- either version 1.3, or (at your option) any later version
+ either version 1.3, or (at your option) any later version;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts;
(read "COPYING_FDL_V1_3" or "http://gnu.org/licenses/fdl-1.3.html"), or
d) the GNU General Public License as published by the Free Software Foundation;
@@ -53,8 +62,6 @@ d) the GNU General Public License as published by the Free Software Foundation;
-----------------------------------------------------------------------------------------------------------
-Parabola Classic logotype - Luke Shumaker <lukeshu@sbcglobal.net>
-
The image files (in src/img-cbs);
You can redistribute it and/or modify it under the terms of either: