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

[Andras Timar]

 patches/dev300/apply              |    7 ++++++-
 patches/dev300/fsfhu-instset.diff |   14 ++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 3e43d1fa6555b4d6d2bc8e8586f4be50080f928e
Author: mstscadmin <mstscadmin at ooobuild.(none)>
Date:   Mon Mar 1 12:47:33 2010 +0100

    Introducing FSFhuWin32Only section
    
    * patches/dev300/apply:
    * patches/dev300/fsfhu-instset.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1821374..9e0aab7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -149,7 +149,7 @@ OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, IntegrateExtensions, Lib
 OxygenOfficeLinux:	OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
 OxygenOfficeWindows:	OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeWin32Only
 # FSFhu
-FSFhuWindows : Win32Common, NovellOnly, Fpickers, CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions
+FSFhuWindows : Win32Common, NovellOnly, FSFhuWin32Only, Fpickers, CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions
 FSFhuLinux : NovellBase, EMFPlus, CairoFonts, LiberationFontsOnWindows, IntegrateExtensions
 FSFhuMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions
 # Plain build; just with base build fixes
@@ -3639,3 +3639,8 @@ vbahelper-optionality-fix.diff, i#108853, ericb
 SectionOwner => cbosdo
 
 toolbar-decorations-fix.diff
+
+[ FSFhuWin32Only ]
+SectionOwner => timar
+
+fsfhu-instset.diff 
diff --git a/patches/dev300/fsfhu-instset.diff b/patches/dev300/fsfhu-instset.diff
new file mode 100755
index 0000000..23102e6
--- /dev/null
+++ b/patches/dev300/fsfhu-instset.diff
@@ -0,0 +1,14 @@
+--- instsetoo_native/util/makefile.mk	30 Jul 2008 13:30:16 -0000	1.90.8.1
++++ instsetoo_native/util/makefile.mk	29 Sep 2008 12:24:56 -0000
+@@ -102,9 +102,9 @@ ALLTAR : $(LOCALPYFILES)
+ .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+ .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+ .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
+-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack 
++ALLTAR : openoffice_hu 
+ .ELSE
+-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack sdkoo_en-US ure_en-US
++ALLTAR : openoffice_hu sdkoo_en-US ure_en-US
+ .ENDIF
+ .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+ ALLTAR : updatepack