instsetoo_native/util/openoffice.lst | 47 +++++++++++++++---------------- solenv/bin/modules/installer/download.pm | 1 2 files changed, 24 insertions(+), 24 deletions(-)
New commits: commit 2444e28e8e619772b37311765a3d95a532466d1f Author: Petr Mladek <[email protected]> Date: Tue Jun 19 15:21:34 2012 +0200 do not repeate twice .0.0.beta1 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 60d9efcb13d1dcf0910926298067b7f7c5804483 Author: Petr Mladek <[email protected]> Date: Tue Jun 19 12:13:58 2012 +0200 switch to the new version scheme use 3.7.0.0.beta1 where possible; use the suffix "+" in the about dialog to signalize non-release builds Change-Id: I395e0cb6bbf9c3b3698b0c40db9aab7e4aa5cd28 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 2224b4d..4d7a82b 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -1,10 +1,11 @@ Globals + { Settings { variables { - UREPACKAGEVERSION 3.6.0 + UREPACKAGEVERSION 3.6.0.0.beta1 URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 3.4 UNIXBASISROOTNAME libreoffice3.6 @@ -50,13 +51,13 @@ LibreOffice PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta1 + SHORT_PRODUCTEXTENSION .0.0.beta1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.6.0 - ABOUTBOXPRODUCTVERSIONSUFFIX beta1+ + ABOUTBOXPRODUCTVERSION 3.6.0.0.beta1 + ABOUTBOXPRODUCTVERSIONSUFFIX + BASEPRODUCTVERSION 3.6 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -65,7 +66,7 @@ LibreOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.6.0 + PACKAGEVERSION 3.6.0.0.beta1 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -102,14 +103,14 @@ LibreOffice_Dev PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta1 + SHORT_PRODUCTEXTENSION .0.0.beta1 UNIXBASISROOTNAME lodev3.6 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.6.0 - ABOUTBOXPRODUCTVERSIONSUFFIX beta1+ + ABOUTBOXPRODUCTVERSION 3.6.0.0.beta1 + ABOUTBOXPRODUCTVERSIONSUFFIX + BASEPRODUCTVERSION 3.6 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -123,7 +124,7 @@ LibreOffice_Dev FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.6.0 + PACKAGEVERSION 3.6.0.0.beta1 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -161,12 +162,12 @@ URE { PRODUCTNAME URE PRODUCTVERSION 3.6 - PACKAGEVERSION 3.6 + PACKAGEVERSION 3.6.0.0.beta1 PACKAGEREVISION 1 PRODUCTEXTENSION BRANDPACKAGEVERSION 3.6 LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta1 + SHORT_PRODUCTEXTENSION .0.0.beta1 LICENSENAME LGPL NOVERSIONINDIRNAME 1 PCPFILENAME ure.pcp @@ -198,11 +199,11 @@ LibreOffice_SDK PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta1 + SHORT_PRODUCTEXTENSION .0.0.beta1 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.6 - PACKAGEVERSION 3.6.0 + PACKAGEVERSION 3.6.0.0.beta1 PACKAGEREVISION {buildid} PACK_INSTALLED 1 DMG_VOLUMEEXTENSION SDK @@ -239,12 +240,12 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta1 + SHORT_PRODUCTEXTENSION .0.0.beta1 UNIXBASISROOTNAME lodev3.6 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.6 - PACKAGEVERSION 3.6.0 + PACKAGEVERSION 3.6.0.0.beta1 PACKAGEREVISION {buildid} BASISPACKAGEPREFIX lodevbasis UREPACKAGEPREFIX lodev @@ -286,11 +287,11 @@ LibreOffice_Test PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta1 + SHORT_PRODUCTEXTENSION .0.0.beta1 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.6 - PACKAGEVERSION 3.6.0 + PACKAGEVERSION 3.6.0.0.beta1 PACKAGEREVISION {buildid} PACK_INSTALLED 1 DMG_VOLUMEEXTENSION TEST @@ -327,12 +328,12 @@ LibreOffice_Dev_Test PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta1 + SHORT_PRODUCTEXTENSION .0.0.beta1 UNIXBASISROOTNAME lodev3.6 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.6 - PACKAGEVERSION 3.6.0 + PACKAGEVERSION 3.6.0.0.beta1 PACKAGEREVISION {buildid} BASISPACKAGEPREFIX lodevbasis UREPACKAGEPREFIX lodev @@ -373,13 +374,13 @@ OxygenOffice PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION beta1 + SHORT_PRODUCTEXTENSION .0.0.beta1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.6.0 - ABOUTBOXPRODUCTVERSIONSUFFIX beta1+ + ABOUTBOXPRODUCTVERSION 3.6.0.0.beta1 + ABOUTBOXPRODUCTVERSIONSUFFIX + BASEPRODUCTVERSION 3.6 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -388,7 +389,7 @@ OxygenOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.6.0 + PACKAGEVERSION 3.6.0.0.beta1 PACKAGEREVISION {buildid} LICENSENAME LGPL SERVICESPROJEKT 1 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
