diff options
| author | Andras Timar <andras.timar@collabora.com> | 2013-10-29 08:31:22 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-10-29 13:17:34 -0700 |
| commit | 7fea21dc92e9c187c83850b8da1470c164813dbd (patch) | |
| tree | 31ec51661bbcb06cbf3d4f96394bda3c6a56994b | |
| parent | c1e7fe6c88f51e49201e12942aa1a71ad9cc7de4 (diff) | |
Collabora versioning
Change-Id: I4cb50e83084ecf5a8322260dd64650510bd286c4
major: 4, minor: 1, obviously
micro: 10, higher than any TDF builds, so we rule
patch: 1, it will be bumped for PTF releases
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 4084f3a09294..5670c1e8ca90 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],[4.1.4.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.1.10.1],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) save_CC=$CC diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index e750e976c2cc..8083d562b6c3 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@ URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 3.4 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 1 + WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@ OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 BUILDIDCWS {buildidcws} @@ -46,13 +46,13 @@ 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 @LIBO_VERSION_MAJOR@ - 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 @@ -61,7 +61,7 @@ LibreOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.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 GLOBALFILEGID gid_File_Lib_Oox |