diff options
author | Petr Mladek <pmladek@suse.cz> | 2012-06-19 16:18:22 +0200 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2012-06-19 16:24:04 +0200 |
commit | 293fa2da6984c2ecb8290212f879404089d1748b (patch) | |
tree | fa01dc9ac61ade55317d1b3f37c49a507ee7e91e | |
parent | n#758883 dmapper: take care of border width when setting margins (diff) | |
download | core-293fa2da6984c2ecb8290212f879404089d1748b.tar.gz core-293fa2da6984c2ecb8290212f879404089d1748b.zip |
switch to the new version scheme
use 3.7.0.0.alpha0 where possible;
use the suffix "+" in the about dialog to signalize non-release builds
Change-Id: If09c78cd30b10e54c46f737a695e0194039c7efc
-rw-r--r-- | instsetoo_native/util/openoffice.lst | 46 | ||||
-rw-r--r-- | solenv/inc/minor.mk | 4 |
2 files changed, 25 insertions, 25 deletions
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index a82fa2489cae..b4d217567bf8 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -4,7 +4,7 @@ Globals { variables { - UREPACKAGEVERSION 3.6.98 + UREPACKAGEVERSION 3.7.0.0.alpha0 URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 3.4 UNIXBASISROOTNAME libreoffice3.7 @@ -50,13 +50,13 @@ LibreOffice PRODUCTVERSION 3.7 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION alpha0 + SHORT_PRODUCTEXTENSION .0.0.alpha0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.7 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.7.0 - ABOUTBOXPRODUCTVERSIONSUFFIX alpha0+ + ABOUTBOXPRODUCTVERSION 3.7.0.0.alpha0 + ABOUTBOXPRODUCTVERSIONSUFFIX + BASEPRODUCTVERSION 3.7 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -65,7 +65,7 @@ LibreOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.6.98 + PACKAGEVERSION 3.7.0.0.alpha0 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -102,14 +102,14 @@ LibreOffice_Dev PRODUCTVERSION 3.7 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION alpha0 + SHORT_PRODUCTEXTENSION .0.0.alpha0 UNIXBASISROOTNAME lodev3.7 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.7 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.7.0 - ABOUTBOXPRODUCTVERSIONSUFFIX alpha0+ + ABOUTBOXPRODUCTVERSION 3.7.0.0.alpha0 + ABOUTBOXPRODUCTVERSIONSUFFIX + BASEPRODUCTVERSION 3.7 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -123,7 +123,7 @@ LibreOffice_Dev FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.6.98 + PACKAGEVERSION 3.7.0.0.alpha0 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -161,12 +161,12 @@ URE { PRODUCTNAME URE PRODUCTVERSION 3.7 - PACKAGEVERSION 3.7 + PACKAGEVERSION 3.7.0.0.alpha0 PACKAGEREVISION 1 PRODUCTEXTENSION BRANDPACKAGEVERSION 3.7 LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION alpha0 + SHORT_PRODUCTEXTENSION .0.0.alpha0 LICENSENAME LGPL NOVERSIONINDIRNAME 1 PCPFILENAME ure.pcp @@ -198,11 +198,11 @@ LibreOffice_SDK PRODUCTVERSION 3.7 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION alpha0 + SHORT_PRODUCTEXTENSION .0.0.alpha0 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.7 - PACKAGEVERSION 3.6.98 + PACKAGEVERSION 3.7.0.0.alpha0 PACKAGEREVISION {buildid} PACK_INSTALLED 1 DMG_VOLUMEEXTENSION SDK @@ -239,12 +239,12 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.7 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION alpha0 + SHORT_PRODUCTEXTENSION .0.0.alpha0 UNIXBASISROOTNAME lodev3.7 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.7 - PACKAGEVERSION 3.6.98 + PACKAGEVERSION 3.7.0.0.alpha0 PACKAGEREVISION {buildid} BASISPACKAGEPREFIX lodevbasis UREPACKAGEPREFIX lodev @@ -286,11 +286,11 @@ LibreOffice_Test PRODUCTVERSION 3.7 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION alpha0 + SHORT_PRODUCTEXTENSION .0.0.alpha0 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.7 - PACKAGEVERSION 3.6.98 + PACKAGEVERSION 3.7.0.0.alpha0 PACKAGEREVISION {buildid} PACK_INSTALLED 1 DMG_VOLUMEEXTENSION TEST @@ -327,12 +327,12 @@ LibreOffice_Dev_Test PRODUCTVERSION 3.7 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION alpha0 + SHORT_PRODUCTEXTENSION .0.0.alpha0 UNIXBASISROOTNAME lodev3.7 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.7 - PACKAGEVERSION 3.6.98 + PACKAGEVERSION 3.7.0.0.alpha0 PACKAGEREVISION {buildid} BASISPACKAGEPREFIX lodevbasis UREPACKAGEPREFIX lodev @@ -373,13 +373,13 @@ OxygenOffice PRODUCTVERSION 3.7 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION alpha0 + SHORT_PRODUCTEXTENSION .0.0.alpha0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.7 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.7.0 - ABOUTBOXPRODUCTVERSIONSUFFIX alpha0+ + ABOUTBOXPRODUCTVERSION 3.7.0.0.alpha0 + ABOUTBOXPRODUCTVERSIONSUFFIX + BASEPRODUCTVERSION 3.7 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -388,7 +388,7 @@ OxygenOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.6.98 + PACKAGEVERSION 3.7.0.0.alpha0 PACKAGEREVISION {buildid} LICENSENAME LGPL SERVICESPROJEKT 1 diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 2af8b1ead2fb..ab0e3e1e04eb 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -5,7 +5,7 @@ LAST_MINOR=m0 SOURCEVERSION=OOO370 VERSIONMAJOR=3 -VERSIONMINOR=6 -VERSIONMICRO=98 +VERSIONMINOR=7 +VERSIONMICRO=0 COPYRIGHTYEARRANGE=2000-2012 |