summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-16 23:22:36 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-20 13:07:53 +0000
commit545ad8320643fa3d000f7eab3938d0576304630b (patch)
tree5bf6184569ae7386401aa63384d3a7182df9f118 /instsetoo_native
parente503a69e962bf1b39104e3df91b452702a62aa0e (diff)
Fix version number in scp2-generated version ini-file UpdateID variable
USERDIRPRODUCTVERSION is stuck at 4 now (as its main use is for the version number of the UserInstallation directory), so use LIBO_VERSION_MAJOR instead (like generation of the version ini-file counterpart for instdir/ does in instsetoo_native/CustomTarget_setup.mk). Change-Id: Ib87536d335487383940cff2f69c864a33f05bbee Reviewed-on: https://gerrit.libreoffice.org/35301 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/util/openoffice.lst.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 6673b5d53ad7..06bd10a2004e 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -4,6 +4,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@
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 4.1