[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - instsetoo_native/inc_openoffice instsetoo_native/util setup_native/source solenv/bin solenv/inc

[Libreoffice Gerrit user]

 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |    1 +
 instsetoo_native/util/openoffice.lst                               |    8 ++++----
 setup_native/source/packinfo/finals_instsetoo.txt                  |    2 +-
 solenv/bin/make_installer.pl                                       |    2 +-
 solenv/inc/minor.mk                                                |    4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 11dd1094cb5452a8b61ad6bd284ba9517d3d869a
Author: Andras Timar <atimar at suse.com>
Date:   Wed Jan 16 14:39:03 2013 +0100

    REINSTALL ALL when patching, I found no other way :(
    
    Change-Id: I6cc9aef5668521ab4adc3302e35e3ba6dc66f09b

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index d19f530..061c335 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -42,6 +42,7 @@ ProgressType3	installs
 Quickstarterlinkname	QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNo	Yes
 ReinstallModeText	omus
+REINSTALL	ALL
 SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS
 SetupType	Typical
 SELECT_WORD	0
commit 55b44a8c58baa80ff29239cb7c7133e399964b2f
Author: Andras Timar <atimar at suse.com>
Date:   Mon Jan 14 15:14:20 2013 +0100

    Bump for 3.6-5
    
    Change-Id: Ib941bc26d51f5f150a2de83d8ad203cb177a6bf2

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 536b79a..e56b47e 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 b76416d..5982dcc 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 fb23d97..1854142 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 fbed4dd..7e5f6d2 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