From 4e1969e81e1f75d71054ad22cd16c07a1828f12d Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Wed, 17 Aug 2022 17:11:53 +0200 Subject: [CIBO] Rebrand textual parts to CIB Office Change-Id: I0a1ee58bf363458e4093bbcd087af3827064f745 --- configure.ac | 2 +- instsetoo_native/util/openoffice.lst.in | 58 ++++++++++++++++----------------- sysui/desktop/share/create_tree.sh | 8 ++--- sysui/productlist.mk | 6 ++-- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/configure.ac b/configure.ac index 84c66a9de130..5dd920612bc6 100644 --- a/configure.ac +++ b/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 powered by CIB],[6.1.7.35],[],[],[https://libreoffice.cib.eu/]) +AC_INIT([CIB Office],[6.1.7.35],[],[],[https://libreoffice.cib.eu/]) AC_PREREQ([2.59]) diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 18d3aa742cd7..45b64218e455 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -8,12 +8,12 @@ Globals UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 4.1 - WINDOWSBASISROOTNAME LibreOffice powered by CIB - UNIXBASISROOTNAME libreofficepoweredbycib@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ + WINDOWSBASISROOTNAME CIB Office + UNIXBASISROOTNAME ciboffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ HIDELICENSEDIALOG 1 PACKAGEPREFIX - BASISPACKAGEPREFIX libreofficepoweredbycibbasis - UREPACKAGEPREFIX libreofficepoweredbycib + BASISPACKAGEPREFIX cibofficebasis + UREPACKAGEPREFIX ciboffice SOLSUREPACKAGEPREFIX libreoffice PROGRESSBARCOLOR 255,255,255 PROGRESSSIZE 460,6 @@ -41,13 +41,13 @@ Globals } } -LibreOfficePoweredByCIB +CIBOffice { Settings { variables { - PRODUCTNAME LibreOffice powered by CIB + PRODUCTNAME CIB Office PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ PRODUCTEXTENSION -@LIBO_VERSION_PATCH@ POSTVERSIONEXTENSION @@ -79,24 +79,24 @@ LibreOfficePoweredByCIB active 1 compression 5 script setup_osl - downloadname LibreOfficePoweredByCIB_{productversion}_{os}_install_{languages} - langpackdownloadname LibreOfficePoweredByCIB_{productversion}_languagepack_{os}_install_{languages} - helppackdownloadname LibreOfficePoweredByCIB_{productversion}_helppack_{os}_install_{languages} + downloadname CIBOffice_{productversion}_{os}_install_{languages} + langpackdownloadname CIBOffice_{productversion}_languagepack_{os}_install_{languages} + helppackdownloadname CIBOffice_{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,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} } } -LibreOfficePoweredByCIBDev +CIBOfficeDev { Settings { variables { - PRODUCTNAME LibreOffice Powered By CIB Dev + PRODUCTNAME CIB Office Dev PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ - WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@ - UNIXBASISROOTNAME libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ + WINDOWSBASISROOTNAME CIBOfficeDev @LIBO_VERSION_MAJOR@ + UNIXBASISROOTNAME cibofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ POSTVERSIONEXTENSION BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ @@ -105,9 +105,9 @@ LibreOfficePoweredByCIBDev ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ DEVELOPMENTPRODUCT 1 - BASISPACKAGEPREFIX libreofficepoweredbycibdevbasis - UREPACKAGEPREFIX libreofficepoweredbycibdev - SOLSUREPACKAGEPREFIX libreofficepoweredbycibdev + BASISPACKAGEPREFIX cibofficedevbasis + UREPACKAGEPREFIX cibofficedev + SOLSUREPACKAGEPREFIX cibofficedev REGISTRYLAYERNAME LayerDev UPDATEURL https://update.libreoffice.org/check.php ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt @@ -131,21 +131,21 @@ LibreOfficePoweredByCIBDev active 1 compression 5 script setup_osl - downloadname LibreOfficePoweredByCIBDev_{productversion}_{os}_install_{languages} - langpackdownloadname LibreOfficePoweredByCIBDev_{productversion}_languagepack_{os}_install_{languages} - helppackdownloadname LibreOfficePoweredByCIBDev_{productversion}_helppack_{os}_install_{languages} + downloadname CIBOfficeDev_{productversion}_{os}_install_{languages} + langpackdownloadname CIBOfficeDev_{productversion}_languagepack_{os}_install_{languages} + helppackdownloadname CIBOfficeDev_{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,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} } } -LibreOfficePoweredByCIB_SDK +CIBOffice_SDK { Settings { - downloadname LibreOfficePoweredByCIB-SDK_{packageversion}_{os}_install_{languages} + downloadname CIBOffice-SDK_{packageversion}_{os}_install_{languages} variables { - PRODUCTNAME LibreOffice Powered By CIB + PRODUCTNAME CIB Office PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ POSTVERSIONEXTENSION SDK @@ -176,26 +176,26 @@ LibreOfficePoweredByCIB_SDK } } -LibreOfficePoweredByCIBDev_SDK +CIBOfficeDev_SDK { Settings { - downloadname LibreOfficePoweredByCIBDev-SDK_{packageversion}_{os}_install_{languages} + downloadname CIBOfficeDev-SDK_{packageversion}_{os}_install_{languages} variables { - PRODUCTNAME LibreOfficePoweredByCIBDev + PRODUCTNAME CIBOfficeDev PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ - WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@ - UNIXBASISROOTNAME libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ + WINDOWSBASISROOTNAME CIBOfficeDev @LIBO_VERSION_MAJOR@ + UNIXBASISROOTNAME cibofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ POSTVERSIONEXTENSION SDK BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@.SDK BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ PACKAGEREVISION {buildid} BASISPACKAGEPREFIX lodevbasis - UREPACKAGEPREFIX libreofficedev - SOLSUREPACKAGEPREFIX libreofficedev + UREPACKAGEPREFIX cibofficedev + SOLSUREPACKAGEPREFIX cibofficedev REGISTRYLAYERNAME LayerDev DEVELOPMENTPRODUCT 1 PACK_INSTALLED 1 diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 0ade96cdb4c0..5ccae8cdc941 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -60,14 +60,14 @@ office_root=${office_prefix}/${PREFIX} #this symlink is needed to have the API boostrap functions running right ln -sf "${office_root}/program/soffice" "${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}" -if test "${PREFIX}" != libreofficepoweredbycib${PRODUCTVERSION} -a "${PREFIX}" != libreofficepoweredbycibdev${PRODUCTVERSION} ; then +if test "${PREFIX}" != ciboffice${PRODUCTVERSION} -a "${PREFIX}" != cibofficedev${PRODUCTVERSION} ; then # compat symlinks mkdir -p "${DESTDIR}${office_prefix}" - ln -sf libreofficepoweredbycib${PRODUCTVERSION} "${DESTDIR}${office_root}" - ln -sf /${PREFIXDIR}/bin/${PREFIX} "${DESTDIR}/${PREFIXDIR}/bin/libreofficepoweredbycib${PRODUCTVERSION}" + ln -sf ciboffice${PRODUCTVERSION} "${DESTDIR}${office_root}" + ln -sf /${PREFIXDIR}/bin/${PREFIX} "${DESTDIR}/${PREFIXDIR}/bin/ciboffice${PRODUCTVERSION}" fi -test "${PREFIX}" = libreofficepoweredbycibdev${PRODUCTVERSION} && mime_def_file="libreofficepoweredbycibdev${PRODUCTVERSION}.xml" || mime_def_file="libreofficepoweredbycib${PRODUCTVERSION}.xml" +test "${PREFIX}" = cibofficedev${PRODUCTVERSION} && mime_def_file="cibofficedev${PRODUCTVERSION}.xml" || mime_def_file="ciboffice${PRODUCTVERSION}.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 0159a86ac2b0..71b74cb3580f 100644 --- a/sysui/productlist.mk +++ b/sysui/productlist.mk @@ -7,14 +7,14 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -PRODUCTLIST := libreoffice libreofficedev libreofficepoweredbycib +PRODUCTLIST := libreoffice libreofficedev ciboffice PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO) PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR) PRODUCTNAME.libreoffice := LibreOffice PRODUCTNAME.libreofficedev := LibreOfficeDev -PRODUCTNAME.libreofficepoweredbycib := LibreOfficePoweredByCIB +PRODUCTNAME.ciboffice := CIBOffice UNIXFILENAME.libreoffice := libreoffice$(PKGVERSIONSHORT) UNIXFILENAME.libreofficedev := libreofficedev$(PKGVERSIONSHORT) -UNIXFILENAME.libreofficepoweredbycib := libreofficepoweredbycib$(PKGVERSIONSHORT) +UNIXFILENAME.ciboffice := cibboffice$(PKGVERSIONSHORT) # vim: set noet sw=4 ts=4: -- cgit