[Libreoffice-commits] .: 2 commits - instsetoo_native/util solenv/bin solenv/inc
Petr Mladek
pmladek at kemper.freedesktop.org
Tue Jun 19 07:24:59 PDT 2012
instsetoo_native/util/openoffice.lst | 46 +++++++++++++++----------------
solenv/bin/modules/installer/download.pm | 1
solenv/inc/minor.mk | 4 +-
3 files changed, 25 insertions(+), 26 deletions(-)
New commits:
commit ed4c2ab1e3f83cce828734b887e4884fc2f5ac4c
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jun 19 15:21:34 2012 +0200
do not repeate twice .0.0.beta2 in the download tarball name
PRODUCTVERSION is associated with SHORT_PRODUCTEXTENSION.
ABOUTBOXPRODUCTVERSION is associated with ABOUTBOXPRODUCTVERSIONSUFFIX.
We should not mix these another way.
Change-Id: I991f74e058d19ec3ae0d98e8efe8458d648ae74c
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index b7a96dc..8174067 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -360,7 +360,6 @@ sub get_download_version
my $version = "";
$version = $allvariables->{'PRODUCTVERSION'};
- if (( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ) && ( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ne "" )) { $version = $allvariables->{'ABOUTBOXPRODUCTVERSION'}; }
if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $version = $version . $allvariables->{'SHORT_PRODUCTEXTENSION'}; }
return $version;
commit 293fa2da6984c2ecb8290212f879404089d1748b
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jun 19 16:18:22 2012 +0200
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
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index a82fa24..b4d2175 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 2af8b1e..ab0e3e1 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
More information about the Libreoffice-commits
mailing list