summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2014-04-17 09:55:57 -0700
committerAndras Timar <andras.timar@collabora.com>2018-03-15 23:03:28 +0100
commitf956b4a37a2421563e0e7fbad8e228372f58aae3 (patch)
tree559f13b94e129fb28169349d4fd72c81b99b71bc /instsetoo_native
parent1dfb747f3c12881f54c2c826eaf0aaa938883a54 (diff)
Collabora Office versioning
Conflicts: configure.ac Conflicts: configure.ac instsetoo_native/util/openoffice.lst.in (cherry picked from commit dec4b25aaceeba671c0c3f7f81ef13e5b8e42e00) Change-Id: Iff7004808f9637f3dbc6393751246c3a82134487
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/util/openoffice.lst.in12
1 files changed, 6 insertions, 6 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 24bb9761f7f0..6c1b7e027b6e 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
STARTCENTER_HIDE_EXTERNAL_LINKS 0
64BITPRODUCT @WINDOWS_X64@
@@ -47,19 +47,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 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