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

[Tor Lillqvist]

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

New commits:
commit 7aa0f787ab6c442cdc5aef597174cad27b308e43
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Apr 7 14:44:49 2011 +0300

    Make instsetoo_native-win32-packaging.diff apply again
    
    Also add a comment about it in the apply file.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index df500c3..c8b3af0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1723,5 +1723,6 @@ symbols-20-august.diff, i#11167, jopsen
 vEdit-13-August.diff, jopsen
 
 [ Win32Packaging ]
-# patch to create a multilang installer and helppacks by default
+# 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
index b08d52a..8e8cf59 100644
--- a/patches/dev300/instsetoo_native-win32-packaging.diff
+++ b/patches/dev300/instsetoo_native-win32-packaging.diff
@@ -4,10 +4,10 @@
  .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
  .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
  .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
--ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack ooohelppack
+-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack)
 +ALLTAR : openofficeall ooohelppack
  .ELSE
--ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack ooohelppack sdkoo_en-US ure_en-US
+-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) sdkoo_en-US ure_en-US
 +ALLTAR : openofficeall sdkooall ooohelppack
  .ENDIF
  .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""