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

[Tor Lillqvist]

 patches/dev300/apply                                 |   13 ++++---------
 patches/dev300/instsetoo_native-win32-packaging.diff |   14 --------------
 2 files changed, 4 insertions(+), 23 deletions(-)

New commits:
commit 46c0cca5ddf98ffeac90e8c9caf0b70f7f968341
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 1 16:52:15 2011 +0300

    instsetoo_native-win32-packaging.diff has been integrated

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a43373b..9a1cd69 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -30,7 +30,7 @@ Experimental: VBAUntested, ArkOnlyExperimental, \
 	      PostgreSQL, RadioButtons, WWInProgress, \
 	      KDE4Experimental, MinGW, Netbook, \
 	      CrossWin32Patches, AutoLayout, \
-	      Speed, GSoC2010, Toolbars, Win32Packaging
+	      Speed, GSoC2010, Toolbars
 DebianLooseSections: DebianBaseNoHelpContent
 # Optional sections
 Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
@@ -97,7 +97,7 @@ translate-org-za-win32: translate-org-za-common, Win32Common, Common
 NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin32Only, \
 	CustomUserConfig, LiberationFontsOnWindows
 # Novell
-NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, Win32Packaging
+NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
 NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
 # Mac OS X
 MacOSX : MacOSXCommon, MacOSXOnly
@@ -119,8 +119,8 @@ CrossWin32 : CrossWin32Patches
 # Generic Patch-less builds
 Raw: RawCommon RawPatches
 # LibreOffice
-LibreOfficeWin32: LibreOfficeCommon LibreOfficePatches LibreOfficeWin32Patches, Win32Packaging
-LibreOfficeWin64: LibreOfficeCommon LibreOfficePatches LibreOfficeWin32Patches, Win32Packaging
+LibreOfficeWin32: LibreOfficeCommon LibreOfficePatches LibreOfficeWin32Patches
+LibreOfficeWin64: LibreOfficeCommon LibreOfficePatches LibreOfficeWin32Patches
 LibreOfficeLinux: LibreOfficeCommon LibreOfficePatches LibreOfficeLinuxPatches
 LibreOfficeLinuxDevel: LibreOfficeCommon LibreOfficePatches LibreOfficeLinuxPatches
 LibreOfficeMacOSX: LibreOfficeCommon LibreOfficePatches LibreOfficeMacOSXPatches
@@ -1474,8 +1474,3 @@ 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
-# This needs to be kept as a patch, do not integrate.
-instsetoo_native-win32-packaging.diff, fridrich
diff --git a/patches/dev300/instsetoo_native-win32-packaging.diff b/patches/dev300/instsetoo_native-win32-packaging.diff
deleted file mode 100644
index 8e8cf59..0000000
--- a/patches/dev300/instsetoo_native-win32-packaging.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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 $(eq,$(OS),MACOSX $(NULL) ooohelppack)
-+ALLTAR : openofficeall ooohelppack
- .ELSE
--ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) sdkoo_en-US ure_en-US
-+ALLTAR : openofficeall sdkooall ooohelppack
- .ENDIF
- .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
- ALLTAR : updatepack