[ooo-build-commit] .: patches/dev300

[Andras Timar]

 patches/dev300/apply                           |    8 ++------
 patches/dev300/win32-multi-lang-installer.diff |    2 +-
 patches/dev300/win32-no-uninstall-survey.diff  |    7 ++-----
 3 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 80d0690616c0d25fe6479c57b1febfdfded141e7
Author: Andras Timar <timar at fsf.hu>
Date:   Mon Feb 22 11:08:53 2010 +0100

    Changed the order of two patches
    
    When patching scp2/source/ooo/windowscustomaction_ooo.scp,
    win32-no-uninstall-survey.diff should come first, because win32-multilang.installer.diff
    is not applied to FSFhuWindows and to OxygenOffice, and
    Original win32-no-uninstall-survey.diff was made against the already patched file.
    
    * patches/dev300/apply:
    * patches/dev300/win32-multi-lang-installer.diff:
    * patches/dev300/win32-no-uninstall-survey.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1942398..1057121 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -289,9 +289,6 @@ sc-cellsuno-avoid-early-destruction.diff, i#90076, pmladek
 # idlc/regmerge runs in offapi build
 registry-speed-fix.diff, thorsten
 
-# don't let HelpLinker be miscompiled with g++ 4.3
-gcc-HelpLinker.diff
-
 [ TemporaryHacks and not MacOSXOnly ]
 
 # don't lstat() that much while creating absolute URLs - breaks unopkg
@@ -1574,6 +1571,8 @@ win32-gw-send-mail.diff, i#34264, n#418407, tml
 # This enables building multi language installsets with new (Windows SDK) problematic msitrans.exe
 msitrans-problemchecksum.diff, kami
 
+# No survey after uninstallation, thank you
+win32-no-uninstall-survey.diff, tml
 
 [ MultilanguageWin32Only ]
 # Multi-language installer stuff
@@ -2829,9 +2828,6 @@ win32-no-seterror-when-debugging.diff, tml
 # restore them if still relevant when uninstalling OOo
 win32-restore-associations.diff, n#530872, tml
 
-# No survey after uninstallation, thank you
-win32-no-uninstall-survey.diff, tml
-
 [ Fixes ]
 #sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml
 
diff --git a/patches/dev300/win32-multi-lang-installer.diff b/patches/dev300/win32-multi-lang-installer.diff
index 5b3f4c2..0b3ae5d 100644
--- a/patches/dev300/win32-multi-lang-installer.diff
+++ b/patches/dev300/win32-multi-lang-installer.diff
@@ -16,7 +16,7 @@
 --- scp2/source/ooo/windowscustomaction_ooo.scp
 +++ scp2/source/ooo/windowscustomaction_ooo.scp
 @@ -443,2 +443,11 @@
- 	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and Not UPGRADINGPRODUCTCODE", "end");
+	 Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
  End
 +
 +WindowsCustomAction gid_Customaction_SelectLanguage
diff --git a/patches/dev300/win32-no-uninstall-survey.diff b/patches/dev300/win32-no-uninstall-survey.diff
index ca71a2d..d8a0358 100644
--- a/patches/dev300/win32-no-uninstall-survey.diff
+++ b/patches/dev300/win32-no-uninstall-survey.diff
@@ -1,6 +1,6 @@
 --- scp2/source/ooo/windowscustomaction_ooo.scp
 +++ scp2/source/ooo/windowscustomaction_ooo.scp
-@@ -502,15 +502,6 @@
+@@ -511,11 +511,3 @@
  	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
  End
  
@@ -12,7 +12,4 @@
 -	Inbinarytable = 1;
 -	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and Not UPGRADINGPRODUCTCODE", "end");
 -End
--
- WindowsCustomAction gid_Customaction_SelectLanguage
- 	Name = "SelectLanguage";
- 	Typ = "321";
+-
\ No newline at end of file