use new gnu-freedood logov3.2.4-parabola2

6 files changed, 31 insertions, 14 deletions

diff --git a/src/branding/parabola/COPYING b/src/branding/parabola/COPYING
index dfbb86ae9..0817d8d55 100644
--- a/src/branding/parabola/COPYING
+++ b/src/branding/parabola/COPYING
@@ -1,10 +1,34 @@
 Parabola branding image sources:
-  https://wiki.parabola.nu/File:Parabola_logo,_GNU_and_Bola.svg.png
-  https://wiki.parabola.nu/File:Wallpaper_Parabola_Landscape_r800x450px.png
-  https://git.parabola.nu/pac.git/tree/src/img+gpl/symbol-parabolaOfficialLogotype-default_r128px2_noa_nof_nos_svg1d1.svg
 
-
-This is Free work, you can redistribute it and/or modify it under the terms of either:
+  parabola-gnu-freedood.png
+    Author:         José Miguel Silva Lara          <crazytoon@parabola.nu>
+    Author:         Márcio Alexandre Silva Delgado  <coadde@parabola.nu>
+    Contributor:    bill-auger                      <bill-auger@programmer.net>
+    Licence:        GPLv2+, FALv1.3+, CC-BY-SAv4.0+, FDLv1.3+
+    Fetched from:   https://git.parabola.nu/artwork.git/plain/banners/parabola-gnu-freedood.png?h=official/2018
+    Derrived from:  https://git.parabola.nu/artwork.git/plain/sources/freedood.svg?h=official/2018
+    Derrived from:  https://git.parabola.nu/artwork.git/plain/sources/parabola-gnu.svg?h=official/2018
+    Derrived from:  https://git.parabola.nu/artwork.git/plain/sources/parabola-logo.svg?h=official/2018
+    Changes:        Cropped, simplified, or colored
+
+  parabola-calamares-banner-dark.png
+  parabola-logo.svg
+  parabolaicon.png
+    Author:         Jorge Araya Navarro  <elcorreo@deshackra.com>
+    Contributor:    Luke Shumaker        <lukeshu@sbcglobal.net>
+    Licence:        CC BY 3.0 Unported
+    Fetched from:   https://git.parabola.nu/artwork.git/plain/banners/parabola-calamares-banner-dark.png?h=official/2018
+    Fetched from:   https://git.parabola.nu/artwork.git/plain/sources/parabola-logo.svg?h=official/2018
+    Fetched from:   https://git.parabola.nu/artwork.git/plain/icons/parabolaicon.png?h=official/2018
+    Changes:        Cropped, simplified, or colored
+
+  Wallpaper_Parabola_Landscape_r800x450px.png
+    Author:         José Miguel Silva Lara  <crazytoon@parabola.nu>
+    Licence:        FALv1.3+, CC-BY-SAv4.0+, FDLv1.3+
+    Fetched from:   https://wiki.parabola.nu/File:Wallpaper_Parabola_Landscape_r800x450px.png
+
+
+These are Free Culture works, you can redistribute and/or modify them under the terms of either:
 
 a) The Free Art License as published by Copyleft Attitude;
    either version 1.3, or (at your option) any later version
@@ -18,10 +42,3 @@ c) The GNU Free Documentation License as published by the Free Software Foundati
    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")
-
-
-The file: 'symbol-parabolaOfficialLogotype-default_r128px2_noa_nof_nos_svg1d1.svg' ('calamares.svg' as installed) can also be redistributed and/or modified it under the terms of:
-
-d) The GNU General Public License as published by the Free Software Foundation;
-   either version 2, or (at your option) any later version
-   (read "COPYING_GPL_V2_0" or "http://gnu.org/licenses/gpl-2.0.html")
diff --git a/src/branding/parabola/branding.desc b/src/branding/parabola/branding.desc
index 77c4b0d23..258ac1d81 100644
--- a/src/branding/parabola/branding.desc
+++ b/src/branding/parabola/branding.desc
@@ -18,7 +18,7 @@ strings:
   knownIssuesUrl:      http://labs.parabola.nu/
 
 images:
-  productLogo:    "parabola-gnu-freedood-logo.png"
+  productLogo:    "parabola-gnu-freedood.png"
   productIcon:    "parabolaicon.png"
   productWelcome: "languages.png"
   productBanner:  "parabola-calamares-banner-dark.png"
diff --git a/src/branding/parabola/parabola-gnu-freedood-logo.png b/src/branding/parabola/parabola-gnu-freedood-logo.png
deleted file mode 100644
index 341e69e13..000000000
--- a/src/branding/parabola/parabola-gnu-freedood-logo.png
+++ /dev/null
diff --git a/src/branding/parabola/parabola-gnu-freedood.png b/src/branding/parabola/parabola-gnu-freedood.png
new file mode 100644
index 000000000..d82b65294
--- /dev/null
+++ b/src/branding/parabola/parabola-gnu-freedood.png
diff --git a/src/branding/parabola/symbol-parabolaOfficialLogotype-default_r128px2_noa_nof_nos_svg1d1.svg b/src/branding/parabola/parabola-logo.svg
index 119266d29..119266d29 100644
--- a/src/branding/parabola/symbol-parabolaOfficialLogotype-default_r128px2_noa_nof_nos_svg1d1.svg
+++ b/src/branding/parabola/parabola-logo.svg
diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt
index 881dcd4b4..02d8dd5b5 100644
--- a/src/calamares/CMakeLists.txt
+++ b/src/calamares/CMakeLists.txt
@@ -64,7 +64,7 @@ install( TARGETS calamares_bin
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
-install( FILES ${CMAKE_SOURCE_DIR}/src/branding/parabola/symbol-parabolaOfficialLogotype-default_r128px2_noa_nof_nos_svg1d1.svg
+install( FILES ${CMAKE_SOURCE_DIR}/src/branding/parabola/parabola-logo.svg
     RENAME calamares.svg
     DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps
 )