[Libreoffice-commits] .: Branch 'libreoffice-3-3-2' - patches/dev300

[Fridrich Strba]

 patches/dev300/apply                                 |   10 +++++++---
 patches/dev300/instsetoo_native-win32-packaging.diff |   14 ++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit e9e01d2ee217366161553bcf6b55acdb387ea55b
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Mar 15 10:23:26 2011 +0100

    Win32 packaging for release as patch

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4df4ea2..37b396c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -34,7 +34,7 @@ Experimental: VBAUntested, ArkOnlyExperimental, \
 	      KDE4Experimental, MinGW, CalcExperimental, \
 	      OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
 	      WriterNavigation \
-	      HPPA, AXP, Speed, GSoC2010, Toolbars
+	      HPPA, AXP, Speed, GSoC2010, Toolbars, Win32Packaging
 DebianLooseSections: DebianBaseNoHelpContent
 # Optional sections
 Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
@@ -114,7 +114,7 @@ translate-org-za-win32: translate-org-za-common, Win32Common, Common
 NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin32Only, \
 	CustomUserConfig, LiberationFontsOnWindows
 # Novell
-NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
+NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, Win32Packaging
 NovellWin32Eval: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellEvaluation
 NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
 # go-oo.org Win32
@@ -147,7 +147,7 @@ OOo4Kids: OOo4KidsPatches
 # Generic Patch-less builds
 Raw: RawCommon RawPatches
 # LibreOffice
-LibreOfficeWin32: LibreOfficeCommon LibreOfficePatches LibreOfficeWin32Patches
+LibreOfficeWin32: LibreOfficeCommon LibreOfficePatches LibreOfficeWin32Patches, Win32Packaging
 LibreOfficeLinux: LibreOfficeCommon LibreOfficePatches LibreOfficeLinuxPatches
 LibreOfficeLinuxDevel: LibreOfficeCommon LibreOfficePatches LibreOfficeLinuxPatches
 LibreOfficeMacOSX: LibreOfficeCommon LibreOfficePatches LibreOfficeMacOSXPatches
@@ -2354,3 +2354,7 @@ sc-single-right.diff, td123
 sd_effects_styles.diff, pixie
 symbols-20-august.diff, i#11167, jopsen
 vEdit-13-August.diff, jopsen
+
+[ Win32Packaging ]
+# patch to create a multilang installer and helppacks by default
+instsetoo_native-win32-packaging.diff, fridrich
diff --git a/patches/dev300/instsetoo_native-win32-packaging.diff b/patches/dev300/instsetoo_native-win32-packaging.diff
new file mode 100644
index 0000000..b08d52a
--- /dev/null
+++ b/patches/dev300/instsetoo_native-win32-packaging.diff
@@ -0,0 +1,14 @@
+--- instsetoo_native/util/makefile.mk
++++ instsetoo_native/util/makefile.mk
+@@ -85,9 +85,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 ooohelppack
++ALLTAR : openofficeall ooohelppack
+ .ELSE
+-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack ooohelppack sdkoo_en-US ure_en-US
++ALLTAR : openofficeall sdkooall ooohelppack
+ .ENDIF
+ .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+ ALLTAR : updatepack