Collabora Office branding

Change-Id: I9e79c07aa3cbb70076d9bab07294062df4be02c6

configure.ac

@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice],[5.0.10.5],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([Collabora Office],[5.0.10.6],[],[],[https://CollaboraOffice.com/])
 
 AC_PREREQ([2.59])
 
@@ -117,7 +117,7 @@ AC_MSG_CHECKING([for product name])
 if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
     PRODUCTNAME=AC_PACKAGE_NAME"Dev"
 else
-    PRODUCTNAME=AC_PACKAGE_NAME
+    PRODUCTNAME="AC_PACKAGE_NAME"
 fi
 AC_MSG_RESULT([$PRODUCTNAME])
 AC_SUBST(PRODUCTNAME)

instsetoo_native/CustomTarget_setup.mk

@@ -41,7 +41,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 		&& echo 'InstallMode=<installmode>' \
 		&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
 		$(if $(ENABLE_RELEASE_BUILD),\
-			&& echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME))/4', \
+			&& echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]" | tr -d " "),$(shell echo $(PRODUCTNAME) | tr -d " "))/4', \
 			&& echo 'UserInstallation=$$ORIGIN/..') \
 	) > $@
 
@@ -113,9 +113,9 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 		&& echo 'NativeProgress=false' \
 		&& echo 'ProgressBarColor=0,0,0' \
 		&& echo 'ProgressFrameColor=102,102,102' \
-		&& echo 'ProgressPosition=35,153' \
-		&& echo 'ProgressSize=444,8' \
-		&& echo 'ProgressTextBaseline=145' \
+		&& echo 'ProgressPosition=26,235' \
+		&& echo 'ProgressSize=460,6' \
+		&& echo 'ProgressTextBaseline=230' \
 		&& echo 'ProgressTextColor=255,255,255' \
 		&& echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \
 	) > $@

instsetoo_native/util/openoffice.lst.in

@@ -7,20 +7,20 @@ Globals
             UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@
             URELAYERVERSION 1
             REFERENCEOOOMAJORMINOR 4.1
-            WINDOWSBASISROOTNAME LibreOffice @LIBO_VERSION_MAJOR@
-            UNIXBASISROOTNAME libreoffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+            WINDOWSBASISROOTNAME Collabora Office @LIBO_VERSION_MAJOR@
+            UNIXBASISROOTNAME collaboraoffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             HIDELICENSEDIALOG 0
             PACKAGEPREFIX
-            BASISPACKAGEPREFIX libobasis
-            UREPACKAGEPREFIX libreoffice
+            BASISPACKAGEPREFIX collaboraofficebasis
+            UREPACKAGEPREFIX collaboraoffice
             SOLSUREPACKAGEPREFIX libreoffice
             REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
             REGISTRATIONURL http://survey.libreoffice.org/user/index.php
             PROGRESSBARCOLOR 0,0,0
-            PROGRESSSIZE 444,8
-            PROGRESSPOSITION 35,153
+            PROGRESSSIZE 460,6
+            PROGRESSPOSITION 26,235
             PROGRESSFRAMECOLOR 102,102,102
-            PROGRESSTEXTBASELINE 145
+            PROGRESSTEXTBASELINE 230
             PROGRESSTEXTCOLOR 255,255,255
             NATIVEPROGRESS false
             REGISTRYLAYERNAME Layers
@@ -30,7 +30,7 @@ Globals
             UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
             PACKAGEMAP package_names.txt,package_names_ext.txt
             WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
-            OOOVENDOR The Document Foundation
+            OOOVENDOR Collabora Productivity Ltd.
             OOODOWNLOADNAME 1
             STARTCENTER_HIDE_EXTERNAL_LINKS 0
             64BITPRODUCT @WINDOWS_X64@
@@ -45,7 +45,7 @@ LibreOffice
     {
         variables
         {
-            PRODUCTNAME LibreOffice
+            PRODUCTNAME Collabora Office
             PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
             PRODUCTEXTENSION -@LIBO_VERSION_PATCH@
             POSTVERSIONEXTENSION
@@ -77,9 +77,9 @@ LibreOffice
         active          1
         compression     5
         script          setup_osl
-        downloadname    LibreOffice_{productversion}_{os}_install_{languages}
-        langpackdownloadname    LibreOffice_{productversion}_languagepack_{os}_install_{languages}
-        helppackdownloadname    LibreOffice_{productversion}_helppack_{os}_install_{languages}
+        downloadname    CollaboraOffice_{productversion}_{os}_install_{languages}
+        langpackdownloadname    CollaboraOffice_{productversion}_languagepack_{os}_install_{languages}
+        helppackdownloadname    CollaboraOffice_{productversion}_helppack_{os}_install_{languages}
         include         {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{extensionsdir},{licensepath},{packinfopath}
     }
 }

solenv/bin/modules/installer/download.pm

@@ -309,7 +309,7 @@ sub get_downloadname_productname
 
     elsif ( $allvariables->{'PRODUCTNAME'} eq "" ) { $start = "LibreOffice"; }
 
-    else  { $start = $allvariables->{'PRODUCTNAME'}; }
+    else  { $start = $allvariables->{'PRODUCTNAME'}; $start =~ s/ /_/g;}
 
     return $start;
 }

solenv/bin/modules/installer/setupscript.pm

@@ -166,7 +166,7 @@ sub add_lowercase_productname_setupscriptvariable
                 $newline = "\%MASKEDPRODUCTNAME " . $value . "\n";
                 push(@{$variablesref} ,$newline);
                 $value = $original;
-                $value =~ s/\s/\_/g;
+                $value =~ s/\s//g;
                 $newline = "\%UNIXPRODUCTNAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
                 $newline = "\%SYSTEMINTUNIXPACKAGENAME " . lc($value) . "\n";

sysui/productlist.mk

@@ -7,14 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-PRODUCTLIST := libreoffice libreofficedev oxygenoffice
+PRODUCTLIST := libreoffice libreofficedev collaboraoffice
 PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)
 PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)
 PRODUCTNAME.libreoffice := LibreOffice
 PRODUCTNAME.libreofficeodev := LibreOfficeDev
-PRODUCTNAME.oxygenoffice := OxygenOffice
+PRODUCTNAME.collaboraoffice := CollaboraOffice
 UNIXFILENAME.libreoffice := libreoffice$(PKGVERSIONSHORT)
 UNIXFILENAME.libreofficedev := libreofficedev$(PKGVERSIONSHORT)
-UNIXFILENAME.oxygenoffice := oxygenoffice$(PKGVERSIONSHORT)
+UNIXFILENAME.collaboraoffice := collaboraoffice$(PKGVERSIONSHORT)
 
 # vim: set noet sw=4 ts=4: