configure.ac | 2 +- instsetoo_native/util/openoffice.lst.in | 12 ++++++------ postprocess/CustomTarget_registry.mk | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit 00a2436ce6ae91399aaf99b7765d3057bb8c9074 Author: Andras Timar <[email protected]> Date: Thu Apr 17 09:55:57 2014 -0700 LibreOffice-from-Collabora versioning Conflicts: configure.ac Conflicts: configure.ac instsetoo_native/util/openoffice.lst.in Change-Id: Iff7004808f9637f3dbc6393751246c3a82134487 diff --git a/configure.ac b/configure.ac index 989f386..c38cf67 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],[5.0.2.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.0.10.1],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index d05f8ab..935502d 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -4,7 +4,7 @@ Globals { variables { - 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 @LIBO_VERSION_MAJOR@ @@ -29,7 +29,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@ OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 STARTCENTER_HIDE_EXTERNAL_LINKS 0 @@ -47,19 +47,19 @@ LibreOffice { PRODUCTNAME LibreOffice 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 http://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 2502011..79025f9 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -555,7 +555,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' \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
