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>2017-02-19 23:56:33 +0100
commit1d1a79ef024fa6b860d0084c1f7ab13f85b4f22e (patch)
tree857f9725548f490cef3a461cc20d485eea243208 /instsetoo_native
parent800b4ff7f52988828c9544d4c8272fe2b5aa9727 (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 7a8b9b8055bc..34882440bd3c 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@
OOODOWNLOADNAME 1
STARTCENTER_HIDE_EXTERNAL_LINKS 0
64BITPRODUCT @WINDOWS_X64@
@@ -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 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