[cp] Collabora Office branding

Change-Id: I694d9a6c508853d2d980f76cc259ce1e39149da4

18 files changed, 161 insertions, 10 deletions

diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 203d1a881bd3..8ed6793a0de4 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -24,6 +24,7 @@ Name: %pkgprefix-freedesktop-menus
 #BuildRequires: perl
 Group: Office
 License: LGPLv3 with MPLv2, ALv2 and others
+Provides: collaboraoffice-desktop-integration
 Provides: libreoffice-desktop-integration
 Conflicts: %pkgprefix-suse-menus
 Conflicts: %pkgprefix-debian-menus
@@ -375,7 +376,7 @@ fi
 # glibc breaks rpm unless rpm is build with internal glob-matching (issue 49374)
 # https://bugzilla.redhat.com/beta/show_bug.cgi?id=134362
 %defattr(-, root, root)
-%if "%unixfilename" != "libreoffice%productversion" && "%unixfilename" != "libreofficedev%productversion"
+%if "%unixfilename" != "collaboraoffice" && "%unixfilename" != "collaboraofficedev"
 # compat symlinks
 %attr(0755,root,root) /opt/%unixfilename
 %endif
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/main.png b/sysui/desktop/icons/hicolor/128x128/apps/main.png
index 750a07fdabc7..624cdab34e5f 100644
--- a/sysui/desktop/icons/hicolor/128x128/apps/main.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
index 750a07fdabc7..624cdab34e5f 100644
--- a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
+++ b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/main.png b/sysui/desktop/icons/hicolor/16x16/apps/main.png
index db315689340d..4b9e9f769142 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/main.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
index db315689340d..4b9e9f769142 100644
--- a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
+++ b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/main.png b/sysui/desktop/icons/hicolor/256x256/apps/main.png
index ec913e0b4ebb..42f62f9b6548 100644
--- a/sysui/desktop/icons/hicolor/256x256/apps/main.png
+++ b/sysui/desktop/icons/hicolor/256x256/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png b/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png
index ec913e0b4ebb..42f62f9b6548 100644
--- a/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png
+++ b/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/main.png b/sysui/desktop/icons/hicolor/32x32/apps/main.png
index e5839851d48d..ae2e0b42ee76 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/main.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
index e5839851d48d..ae2e0b42ee76 100644
--- a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
+++ b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/main.png b/sysui/desktop/icons/hicolor/48x48/apps/main.png
index dcc03ff1fb2c..3416837ef87b 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/main.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
index dcc03ff1fb2c..3416837ef87b 100644
--- a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
+++ b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
diff --git a/sysui/desktop/icons/hicolor/512x512/apps/main.png b/sysui/desktop/icons/hicolor/512x512/apps/main.png
index 82497c1ac299..c2f4f21bc2e5 100644
--- a/sysui/desktop/icons/hicolor/512x512/apps/main.png
+++ b/sysui/desktop/icons/hicolor/512x512/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/512x512@2/apps/main.png b/sysui/desktop/icons/hicolor/512x512@2/apps/main.png
index 445a859cb271..e83663837199 100644
--- a/sysui/desktop/icons/hicolor/512x512@2/apps/main.png
+++ b/sysui/desktop/icons/hicolor/512x512@2/apps/main.png
diff --git a/sysui/desktop/icons/hicolor/scalable/apps/main.svg b/sysui/desktop/icons/hicolor/scalable/apps/main.svg
index f8a3873a159e..ad5bfe5479cc 100644
--- a/sysui/desktop/icons/hicolor/scalable/apps/main.svg
+++ b/sysui/desktop/icons/hicolor/scalable/apps/main.svg
@@ -1,3 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="linearGradient3898" x1="4" x2="28" y1="31" y2="1" gradientUnits="userSpaceOnUse"><stop stop-color="#4b4b4b" offset="0"/><stop stop-color="#969696" offset="1"/></linearGradient><linearGradient id="linearGradient68760" x1="25" x2="7" y1="27" y2="4" gradientUnits="userSpaceOnUse"><stop stop-color="#fafafa" stop-opacity=".79725" offset="0"/><stop stop-color="#fafafa" offset="1"/></linearGradient><radialGradient id="radialGradient1163" cx="24" cy="6" r="11" gradientTransform="rotate(180,24,6)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".20201" offset="0"/><stop stop-opacity="0" offset="1"/></radialGradient></defs><g fill-rule="evenodd"><path d="m7 0c-2.216 0-4 1.784-4 4v24c0 2.216 1.784 4 4 4h18c2.216 0 4-1.784 4-4v-16l-12-12h-10zm13 0 9 9v-9h-9z" fill="url(#linearGradient3898)" stroke-linecap="square"/><g stroke-linecap="square"><path d="m3 27v1c0 2.216 1.784 4 4 4h18c2.216 0 4-1.784 4-4v-1c0 2.216-1.784 4-4 4h-18c-2.216 0-4-1.784-4-4z" fill-opacity=".19862"/><path d="m20 0h1.4l7.6 7.6v1.4z" fill-opacity=".20149"/></g><path d="m7 3c-0.554 0-1 0.446-1 1v23c0 0.554 0.446 1 1 1h18c0.554 0 1-0.446 1-1v-13.75l-10.25-10.25z" fill="url(#linearGradient68760)"/><path d="m13.424 3a11 11 0 0 0-0.42383 3 11 11 0 0 0 11 11 11 11 0 0 0 2-0.20508v-3.5449l-10.25-10.25h-2.3262z" fill="url(#radialGradient1163)" fill-rule="evenodd" stroke-linecap="square" stroke-width="2"/><path d="m15.75 3 10.25 10.25h-10.25z" fill="#fafafa"/></g></svg>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="134.19557mm"
+   height="134.19557mm"
+   viewBox="0 0 134.19557 134.19557"
+   version="1.1"
+   id="svg4519"
+   sodipodi:docname="collabora-online-logo.svg"
+   inkscape:version="0.92.0 unknown">
+  <defs
+     id="defs4513" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="256.04006"
+     inkscape:cy="260.75029"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4516">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(164.06501,-114.9656)">
+    <polygon
+       id="polygon14"
+       points="17.772,20.172 30.958,32.599 17.914,44.893 17.358,44.386 17.258,20.718 "
+       style="fill:#ffffff"
+       transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+    <polygon
+       style="fill:#5c2983;fill-opacity:1"
+       id="polygon16"
+       points="30.379,33.145 17.914,44.893 28.654,55.638 51.742,32.55 28.561,9.362 17.763,20.162 17.772,20.172 30.379,32.053 30.958,32.599 "
+       transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+    <polygon
+       id="polygon18"
+       points="17.358,44.386 17.258,20.718 29.864,32.599 "
+       style="fill:#c8c8c8"
+       transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+    <polygon
+       style="fill:#2d0b47;fill-opacity:1"
+       id="polygon20"
+       points="27.743,35.628 18.807,44.052 31.847,41.483 "
+       transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+  </g>
+</svg>
diff --git a/sysui/desktop/icons/hicolor/scalable/apps/startcenter.svg b/sysui/desktop/icons/hicolor/scalable/apps/startcenter.svg
index f8a3873a159e..ad5bfe5479cc 100644
--- a/sysui/desktop/icons/hicolor/scalable/apps/startcenter.svg
+++ b/sysui/desktop/icons/hicolor/scalable/apps/startcenter.svg
@@ -1,3 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="linearGradient3898" x1="4" x2="28" y1="31" y2="1" gradientUnits="userSpaceOnUse"><stop stop-color="#4b4b4b" offset="0"/><stop stop-color="#969696" offset="1"/></linearGradient><linearGradient id="linearGradient68760" x1="25" x2="7" y1="27" y2="4" gradientUnits="userSpaceOnUse"><stop stop-color="#fafafa" stop-opacity=".79725" offset="0"/><stop stop-color="#fafafa" offset="1"/></linearGradient><radialGradient id="radialGradient1163" cx="24" cy="6" r="11" gradientTransform="rotate(180,24,6)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".20201" offset="0"/><stop stop-opacity="0" offset="1"/></radialGradient></defs><g fill-rule="evenodd"><path d="m7 0c-2.216 0-4 1.784-4 4v24c0 2.216 1.784 4 4 4h18c2.216 0 4-1.784 4-4v-16l-12-12h-10zm13 0 9 9v-9h-9z" fill="url(#linearGradient3898)" stroke-linecap="square"/><g stroke-linecap="square"><path d="m3 27v1c0 2.216 1.784 4 4 4h18c2.216 0 4-1.784 4-4v-1c0 2.216-1.784 4-4 4h-18c-2.216 0-4-1.784-4-4z" fill-opacity=".19862"/><path d="m20 0h1.4l7.6 7.6v1.4z" fill-opacity=".20149"/></g><path d="m7 3c-0.554 0-1 0.446-1 1v23c0 0.554 0.446 1 1 1h18c0.554 0 1-0.446 1-1v-13.75l-10.25-10.25z" fill="url(#linearGradient68760)"/><path d="m13.424 3a11 11 0 0 0-0.42383 3 11 11 0 0 0 11 11 11 11 0 0 0 2-0.20508v-3.5449l-10.25-10.25h-2.3262z" fill="url(#radialGradient1163)" fill-rule="evenodd" stroke-linecap="square" stroke-width="2"/><path d="m15.75 3 10.25 10.25h-10.25z" fill="#fafafa"/></g></svg>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="134.19557mm"
+   height="134.19557mm"
+   viewBox="0 0 134.19557 134.19557"
+   version="1.1"
+   id="svg4519"
+   sodipodi:docname="collabora-online-logo.svg"
+   inkscape:version="0.92.0 unknown">
+  <defs
+     id="defs4513" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="256.04006"
+     inkscape:cy="260.75029"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4516">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(164.06501,-114.9656)">
+    <polygon
+       id="polygon14"
+       points="17.772,20.172 30.958,32.599 17.914,44.893 17.358,44.386 17.258,20.718 "
+       style="fill:#ffffff"
+       transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+    <polygon
+       style="fill:#5c2983;fill-opacity:1"
+       id="polygon16"
+       points="30.379,33.145 17.914,44.893 28.654,55.638 51.742,32.55 28.561,9.362 17.763,20.162 17.772,20.172 30.379,32.053 30.958,32.599 "
+       transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+    <polygon
+       id="polygon18"
+       points="17.358,44.386 17.258,20.718 29.864,32.599 "
+       style="fill:#c8c8c8"
+       transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+    <polygon
+       style="fill:#2d0b47;fill-opacity:1"
+       id="polygon20"
+       points="27.743,35.628 18.807,44.052 31.847,41.483 "
+       transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+  </g>
+</svg>
diff --git a/sysui/desktop/icons/soffice.ico b/sysui/desktop/icons/soffice.ico
index 0599a0bbdc2b..e2ac84d24ee7 100644
--- a/sysui/desktop/icons/soffice.ico
+++ b/sysui/desktop/icons/soffice.ico
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index ce6475cd5ca5..159a64093113 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -39,14 +39,14 @@ office_root=${office_prefix}/${PREFIX}
 #this symlink is needed to have the API bootstrap functions running right
 ln -sf "${office_root}/program/soffice" "${DESTDIR}/${BINDIR}/${PREFIX}"
 
-if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != libreofficedev${PRODUCTVERSION}  ; then
+if test "${PREFIX}" != collaboraoffice -a "${PREFIX}" != collaboraofficedev  ; then
     # compat symlinks
     mkdir -p "${DESTDIR}${office_prefix}"
-    ln -sf libreoffice${PRODUCTVERSION} "${DESTDIR}${office_root}"
-    ln -sf /${BINDIR}/${PREFIX} "${DESTDIR}/${BINDIR}/libreoffice${PRODUCTVERSION}"
+    ln -sf collaboraoffice "${DESTDIR}${office_root}"
+    ln -sf /${BINDIR}/${PREFIX} "${DESTDIR}/${PREFIXDIR}/bin/collaboraoffice"
 fi
 
-test "${PREFIX}" = libreofficedev${PRODUCTVERSION} && mime_def_file="libreofficedev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml"
+test "${PREFIX}" = collaboraofficedev && mime_def_file="collaboraofficedev.xml" || mime_def_file="collaboraoffice.xml"
 mkdir -p "${DESTDIR}/${PREFIXDIR}/share/mime/packages"
 cp openoffice.org.xml "${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file"
 chmod 0644 "${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file"
diff --git a/sysui/productlist.mk b/sysui/productlist.mk
index 5d21a8e52b87..0349b741be9e 100644
--- a/sysui/productlist.mk
+++ b/sysui/productlist.mk
@@ -7,12 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-PRODUCTLIST := libreoffice libreofficedev
+PRODUCTLIST := collaboraoffice
 PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)
 PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)
 PRODUCTNAME.libreoffice := LibreOffice
 PRODUCTNAME.libreofficedev := LibreOfficeDev
+PRODUCTNAME.collaboraoffice := CollaboraOffice
 UNIXFILENAME.libreoffice := libreoffice$(PKGVERSIONSHORT)
 UNIXFILENAME.libreofficedev := libreofficedev$(PKGVERSIONSHORT)
+UNIXFILENAME.collaboraoffice := collaboraoffice
 
 # vim: set noet sw=4 ts=4: