[ooo-build-commit] Branch 'ooo-build-3-1' - patches/dev300

[Kalman "" Szalai]

 patches/dev300/apply |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 2219021e010b177d6ae19ef999756ff8f64155f4
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Sun Jun 7 09:58:02 2009 +0200

    Move win32-multi-lang-installer.diff patch to Novell related sections
    
    Created MultilanguageWin32Only section in apply file and put
    win32-multi-lang-installer.diff patch into, because this patch
    causes not running installations when the installed OOo's language is
    not match with the language of Windows of at least the regional settings of
    Windows. I put this newly created section into Novell and Go-OO versions.
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index baa6a0c..9d4a03f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -114,13 +114,13 @@ Win32 : Win32Common
 # translate.org.za
 translate-org-za-linux: translate-org-za-common, LinuxCommon, Common, Lockdown
 translate-org-za-win32: translate-org-za-common, Win32Common, Common
-NovellLikeWin32: Win32Common, NovellOnly, NovellOnlyWin32, Lockdown, Fpickers, \
+NovellLikeWin32: Win32Common, NovellOnly, NovellOnlyWin32, MultilanguageWin32Only, Lockdown, Fpickers, \
 	CustomUserConfig, CalcRowLimit, DejaVuFonts, IntegrateExtensions, OOXMLExport
 # Novell
-NovellWin32: NovellLikeWin32, NovellSplash
-NovellWin32ISO: NovellLikeWin32, NovellSplash
+NovellWin32: NovellLikeWin32, MultilanguageWin32Only, NovellSplash
+NovellWin32ISO: NovellLikeWin32, MultilanguageWin32Only, NovellSplash
 # go-oo.org Win32
-GoOoWin32: NovellLikeWin32, GoOoSplash
+GoOoWin32: NovellLikeWin32, MultilanguageWin32Only, GoOoSplash
 # Mac OS X
 MacOSX : MacOSXCommon, MacOSXOnly
 GoOoMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, Fpickers, CustomUserConfig, IntegrateExtensions, GoOoSplash, CalcRowLimit, OOXMLExport
@@ -1460,11 +1460,13 @@ win32-activex-disable.diff, i#65209, i#19510, n#168534, tml
 
 # This enables building scsolver on Win32
 boost-patch.diff, tml
-# Multi-language installer stuff
-win32-multi-lang-installer.diff, i#66062, i#88638, i#88639, tml
 # fixes for visual studio express 2005 ( ooo-build only )
 2005-express-stl-remove.diff, noelpwer, i#71404
 
+[ MultilanguageWin32Only ]
+# Multi-language installer stuff
+win32-multi-lang-installer.diff, i#66062, i#88638, i#88639, tml
+
 [ VBABits ]
 # Parse (& ignore) 'Attribute' statements
 vba-attribute.diff, i#37347, noelpwer