diff options
| author | Andras Timar <atimar@suse.com> | 2012-12-11 17:20:55 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-12-11 17:20:55 +0100 |
| commit | c8915f93a498a9d4e9c096f8ade5be98da6d0e1e (patch) | |
| tree | 8ef3edae8cdbadee751b5465743c2b64178e821f | |
| parent | for lnRef idx 0 is valid index into style matrix (diff) | |
| download | core-c8915f93a498a9d4e9c096f8ade5be98da6d0e1e.tar.gz core-c8915f93a498a9d4e9c096f8ade5be98da6d0e1e.zip | |
enable MSP creation and bump version number for 1st PTF
Change-Id: I18295f2c52f7cb4461e8efbd1f40121ac56e0c5e
| -rw-r--r-- | instsetoo_native/util/openoffice.lst | 10 | ||||
| -rw-r--r-- | setup_native/source/packinfo/finals_instsetoo.txt | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 2 | ||||
| -rw-r--r-- | solenv/inc/minor.mk | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 0fbf55b549e8..536b79acabe8 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -29,10 +29,10 @@ Globals REGISTRYLAYERNAME Layers SERVICEPACK 1 UPDATE_DATABASE 1 - CREATE_MSP_INSTALLSET 0 + CREATE_MSP_INSTALLSET 1 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt - WINDOWSPATCHLEVEL 0 + WINDOWSPATCHLEVEL 4 OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 BUILDIDCWS {buildidcws} @@ -57,7 +57,7 @@ LibreOffice BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6 - ABOUTBOXPRODUCTVERSIONSUFFIX :build-302 + ABOUTBOXPRODUCTVERSIONSUFFIX :build-304 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-302 + ABOUTBOXPRODUCTVERSIONSUFFIX :build-304 BASEPRODUCTVERSION 3.6 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -380,7 +380,7 @@ OxygenOffice BRANDPACKAGEVERSION 3.6 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.6 - ABOUTBOXPRODUCTVERSIONSUFFIX :build-302 + ABOUTBOXPRODUCTVERSIONSUFFIX :build-304 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 5832dfa54a7a..b76416dd591b 100644 --- a/setup_native/source/packinfo/finals_instsetoo.txt +++ b/setup_native/source/packinfo/finals_instsetoo.txt @@ -12,3 +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 diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index d4c2ad807ad2..e9496555dd7e 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -388,7 +388,7 @@ BEGIN $cab_file_per_component = 0; $cabfilecompressionlevel = 21; # Using LZX compression, possible values are: 15 | 16 | ... | 21 (best compression) $number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1 - $include_cab_in_msi = 1; + $include_cab_in_msi = 0; $use_packages_for_cabs = 0; $msidatabasename = ""; $prepare_winpatch = 0; diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 9e2b82d36195..fbed4ddb5071 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,6 +1,6 @@ RSCVERSION=360 -RSCREVISION=360m1(Build:302) -BUILD=302 +RSCREVISION=360m1(Build:304) +BUILD=304 LAST_MINOR=m1 SOURCEVERSION=OOO360 |