[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure scp2/source solenv/bin

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |    2 +-
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt |    2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |    2 +-
 instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt       |    2 +-
 instsetoo_native/inc_ure/windows/msi_templates/Property.idt         |    2 +-
 scp2/source/ooo/windowscustomaction_ooo.scp                         |    4 ++--
 solenv/bin/modules/installer/windows/upgrade.pm                     |    9 ++-------
 7 files changed, 9 insertions(+), 14 deletions(-)

New commits:
commit bb5bde68172dadf8e0ed13b40d523af28e2a7600
Author: Andras Timar <atimar at suse.com>
Date:   Wed Apr 24 04:11:02 2013 -0700

    Upgrade table cleanup
    
    The goal was to migrate feature state from LibreOffice 3.6 (SUSE)
    to LibreOffice 4.0 (SUSE) during upgrade.
    
    Change-Id: I0d7b7511316a9799acb078ee2923a5cac2e40aa9

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index 6cb7e5c..6768f4f 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -40,7 +40,7 @@ ProgressType2	installed
 ProgressType3	installs
 RebootYesNo	Yes
 ReinstallModeText	omus
-SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
+SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS
 SetupType	Typical
 STR_NEW_DISPLAY_NAME	OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT	OOO_STR_EDIT
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
index 6cb7e5c..6768f4f 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
@@ -40,7 +40,7 @@ ProgressType2	installed
 ProgressType3	installs
 RebootYesNo	Yes
 ReinstallModeText	omus
-SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
+SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS
 SetupType	Typical
 STR_NEW_DISPLAY_NAME	OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT	OOO_STR_EDIT
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 301dd7b..4d3c684 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -42,7 +42,7 @@ ProgressType3	installs
 Quickstarterlinkname	QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNo	Yes
 ReinstallModeText	omus
-SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS
+SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS
 SetupType	Typical
 SELECT_WORD	0
 SELECT_EXCEL	0
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
index 91858c2..300adb5 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
@@ -41,7 +41,7 @@ ProgressType2	installed
 ProgressType3	installs
 RebootYesNo	Yes
 ReinstallModeText	omus
-SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
+SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS
 SetupType	Typical
 STR_NEW_DISPLAY_NAME	OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT	OOO_STR_EDIT
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Property.idt b/instsetoo_native/inc_ure/windows/msi_templates/Property.idt
index 8ea4048..db43028 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/Property.idt
@@ -42,7 +42,7 @@ ProgressType2	installed
 ProgressType3	installs
 RebootYesNo	Yes
 ReinstallModeText	omus
-SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR
+SecureCustomProperties	NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS
 SetupType	Typical
 STR_NEW_DISPLAY_NAME	OOO_STR_NEW_DISPLAY_NAME
 STR_EDIT	OOO_STR_EDIT
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index b489c32..31c783a 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -33,7 +33,7 @@ WindowsCustomAction gid_Customaction_RenamePrgFolder
 	Source = "shlxtmsi.dll";
 	Target = "RenamePrgFolder";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID");
+	Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID");
 End
 
 WindowsCustomAction gid_Customaction_RemovePrgFolder
@@ -42,7 +42,7 @@ WindowsCustomAction gid_Customaction_RemovePrgFolder
 	Source = "shlxtmsi.dll";
 	Target = "RemovePrgFolder";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "end");
+	Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "end");
 End
 
 WindowsCustomAction gid_Customaction_Regallmsdocdll
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm
index 547bc4c..4c89a11 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -55,16 +55,11 @@ sub create_upgrade_table
 
     installer::windows::idtglobal::write_idt_header(\@upgradetable, "upgrade");
 
-    # Setting also $installer::globals::msimajorproductversion, that is for example "3.0.0", to differ between old products for OOo 2.x and
-    # older products from OOo 3.x. The latter must be removed always, the removal of the first is controlled with a checkbox.
-    my $newline = $installer::globals::upgradecode . "\t" . "\t" . $installer::globals::msimajorproductversion . "\t" . "\t" . "0" . "\t" . "\t" . "OLDPRODUCTS" . "\n";
-    push(@upgradetable, $newline);
-
     # Setting all products, that must be removed.
-    # $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msimajorproductversion . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "257" . "\t" . "\t" . "OLDPRODUCTSSAMEMAJOR" . "\n";
-    $newline = $installer::globals::upgradecode . "\t" . $installer::globals::msimajorproductversion . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "769" . "\t" . "\t" . "OLDPRODUCTSSAMEMAJOR" . "\n";
+    my $newline = $installer::globals::upgradecode . "\t" . "\t" . $installer::globals::msiproductversion . "\t" . "\t" . "513" . "\t" . "\t" . "OLDPRODUCTS" . "\n";
     push(@upgradetable, $newline);
 
+
     if ( ! $installer::globals::patch )
     {
         # preventing downgrading