diff options
| author | Andras Timar <atimar@suse.com> | 2013-01-14 15:14:20 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-01-15 09:12:37 +0100 |
| commit | 2c31a7ae23d4d084799b699b11a0f1e286852cb0 (patch) | |
| tree | 55974273266a655e7d95586187c3a508e9700009 | |
| parent | 7850822b27981ce46d16532267975b3a91f91102 (diff) | |
Bump for 3.6-5
Change-Id: Ib941bc26d51f5f150a2de83d8ad203cb177a6bf2
| -rw-r--r-- | instsetoo_native/util/openoffice.lst | 8 | ||||
| -rw-r--r-- | setup_native/source/packinfo/finals_instsetoo.txt | 2 | ||||
| -rw-r--r-- | solenv/bin/make_installer.pl | 2 | ||||
| -rw-r--r-- | solenv/inc/minor.mk | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 536b79acabe8..e56b47e50335 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -32,7 +32,7 @@ Globals CREATE_MSP_INSTALLSET 1 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt - WINDOWSPATCHLEVEL 4 + WINDOWSPATCHLEVEL 5 OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 BUILDIDCWS {buildidcws} @@ -57,7 +57,7 @@ LibreOffice BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6 - ABOUTBOXPRODUCTVERSIONSUFFIX :build-304 + ABOUTBOXPRODUCTVERSIONSUFFIX :build-305 BASEPRODUCTVERSION 3.6 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -110,7 +110,7 @@ LibreOffice_Dev BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6 - ABOUTBOXPRODUCTVERSIONSUFFIX :build-304 + ABOUTBOXPRODUCTVERSIONSUFFIX :build-305 BASEPRODUCTVERSION 3.6 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -380,7 +380,7 @@ OxygenOffice BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6 - ABOUTBOXPRODUCTVERSIONSUFFIX :build-304 + ABOUTBOXPRODUCTVERSIONSUFFIX :build-305 BASEPRODUCTVERSION 3.6 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/check.php diff --git a/setup_native/source/packinfo/finals_instsetoo.txt b/setup_native/source/packinfo/finals_instsetoo.txt index b76416dd591b..5982dcc7a4f0 100644 --- a/setup_native/source/packinfo/finals_instsetoo.txt +++ b/setup_native/source/packinfo/finals_instsetoo.txt @@ -12,4 +12,4 @@ # OpenOffice pro de \\<server>\<path>\msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi # OpenOfficeLanguagePack pro es \\<server>\<path>\msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi # URE pro en-US \\<server>\<path>\msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi -LibreOffice pro en-US,af,ar,bn,ca,cs,da,de,el,en-GB,es,fi,fr,gu,he,hi,hu,it,ja,ko,mr,nb,nl,nn,pl,pt,pt-BR,ru,sk,sl,sv,ta,tr,xh,zh-CN,zh-TW,zu c:\libo\suse-3.6\src\first_build\LibreOffice-3.6-3.msi +LibreOffice pro en-US,af,ar,bn,ca,cs,da,de,el,en-GB,es,fi,fr,gu,he,hi,hu,it,ja,ko,mr,nb,nl,nn,pl,pt,pt-BR,ru,sk,sl,sv,ta,tr,xh,zh-CN,zh-TW,zu c:\libo\suse-3.6\src\first_build\LibreOffice-3.6-4.msi diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index fb23d97f31f3..18541420c404 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -1908,7 +1908,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # Path of old installation set: $installer::globals::updatedatabasepath my $mspdir = installer::windows::msp::create_msp_patch($finalinstalldir, $includepatharrayref, $allvariableshashref, $languagestringref, $languagesarrayref, $filesinproductlanguageresolvedarrayref); ($is_success, $finalinstalldir) = installer::worker::analyze_and_save_logfile($loggingdir, $mspdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number); - installer::worker::clean_output_tree(); # removing directories created in the output tree + #installer::worker::clean_output_tree(); # removing directories created in the output tree } ####################################################### diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index fbed4ddb5071..7e5f6d26d7d5 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,6 +1,6 @@ RSCVERSION=360 -RSCREVISION=360m1(Build:304) -BUILD=304 +RSCREVISION=360m1(Build:305) +BUILD=305 LAST_MINOR=m1 SOURCEVERSION=OOO360 |