diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 12 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 3865c8126043..a5103b5a1199 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],[6.2.5.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([Collabora Office],[6.2.10.1],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 65c488bef8a7..170e9619c3de 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -5,7 +5,7 @@ Globals variables { LIBO_VERSION_MAJOR @LIBO_VERSION_MAJOR@ - UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ + UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@ URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 4.1 WINDOWSBASISROOTNAME LibreOffice @@ -30,7 +30,7 @@ Globals CREATE_MSP_INSTALLSET 0 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt - WINDOWSPATCHLEVEL 8 + WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@ OOODOWNLOADNAME 1 64BITPRODUCT @WINDOWS_X64@ WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@ @@ -46,19 +46,19 @@ LibreOffice { PRODUCTNAME @PRODUCTNAME@ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ - PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ + PRODUCTEXTENSION -@LIBO_VERSION_PATCH@ POSTVERSIONEXTENSION BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ USERDIRPRODUCTVERSION 4 - ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ - ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@ + ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@-@LIBO_VERSION_PATCH@ + ABOUTBOXPRODUCTVERSIONSUFFIX BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ PCPFILENAME libreoffice.pcp UPDATEURL https://update.libreoffice.org/check.php ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt ADDSYSTEMINTEGRATION 1 - PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ + PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@ PACKAGEREVISION {buildid} LICENSENAME LGPL ROOTMODULEGID gid_Module_Root diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index d1583f2f81f5..4b7310505da5 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -551,7 +551,7 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval $(call postprocess_lang_deps,$(l # postprocess_main_SED := \ - -e 's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \ + -e 's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)-$(LIBO_VERSION_PATCH),g' \ -e 's,$${ABOUTBOXPRODUCTVERSIONSUFFIX},$(LIBO_VERSION_SUFFIX_SUFFIX),g' \ -e 's,$${DICT_REPO_URL},http://extensions.libreoffice.org/dictionaries/,g' \ -e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(subst $(COMMA),\x2c,$(OOO_VENDOR)),The Document Foundation),g' \ |