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

[Kalman "" Szalai]

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

New commits:
commit 6ac8e94a545edf6dca30629fd3dd4e483c8ae3f8
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Wed Jun 9 20:04:18 2010 +0200

    Update OxygenOffice section
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3a732ae..acf38d2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -144,11 +144,10 @@ Solaris: NovellBase, UnstableExtensions
 # Universal Upstream-like packages
 GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions, GoOoSplash, GTK28
 # OxygenOffice Professional
-OxygenOfficeLinuxCommon :	Common, EMFPlus, FontConfigTemporaryHacks, \
-	      			LinuxOnly, SystemBits, Lockdown, \
-	      			msaccess, OpenGLTransitions, \
-	      			Fpickers, Mono, AddressBooks, QuickStarter, KDE4, IntegrateExtensions, LiberationFontsOnWindows
-OxygenOfficeMacOSXCommon :	Common, SystemBits, IntegrateExtensions, LiberationFontsOnWindows, OOXMLExport
+OxygenOfficeLinuxCommon :	Common, EMFPlus, FontConfigTemporaryHacks, LinuxOnly, SystemBits, Lockdown,   \
+							msaccess, OpenGLTransitions, Fpickers, Mono, AddressBooks, QuickStarter, KDE4,\
+							GlobalNSPluginSupport, IntegrateExtensions, LiberationFontsOnWindows, MagyarLinuxLibertineFonts 
+OxygenOfficeMacOSXCommon :	Common, SystemBits, IntegrateExtensions, LiberationFontsOnWindows, MagyarLinuxLibertineFonts
 OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, IntegrateExtensions, LiberationFontsOnWindows, MagyarLinuxLibertineFonts
 
 OxygenOfficeLinux:	OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
@@ -2944,6 +2943,8 @@ toolbars_sw.diff
 always_default_iconset.diff
 #Always create backup files
 always-create-backups.diff
+# Make CaptionOrderNumberingFirst true for Hungarian
+captionnumbering-hu.diff, i#110273, timar
 
 [ OxygenOfficeExtras ]
 # Adding new items to extras module
@@ -2989,6 +2990,8 @@ ooowikipedia_toolbars.diff
 # So you can upgrade to OxygenOffice without removing OpenOffice.org
 ooop-updatable-sameversion.diff
 
+mail-document-subject.diff, n#459176
+
 [ Win32Only ]
 seamonkey-source-1.1.14.patch.diff, i#84961, tml