[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/instset-macos-langpacks.diff |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a5e56dbe89785eb8c7f88f2bf61c10c7926b47e4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 16:17:33 2009 +0300

    Adapt instset-macos-langpacks.diff to dev300-m57

diff --git a/patches/dev300/instset-macos-langpacks.diff b/patches/dev300/instset-macos-langpacks.diff
index f90f75c..1546397 100644
--- a/patches/dev300/instset-macos-langpacks.diff
+++ b/patches/dev300/instset-macos-langpacks.diff
@@ -106,8 +106,8 @@
 +MY_DIR=$(dirname "$0")
 +
 +osascript "$MY_DIR/osx_langpackinstall.applescript"
---- instsetoo_native/util/makefile.mk	30 Jul 2008 12:49:51 -0000	1.91
-+++ instsetoo_native/util/makefile.mk	1 Oct 2008 01:12:17 -0000	1.72.2.10
+--- instsetoo_native/util/makefile.mk
++++ instsetoo_native/util/makefile.mk
 @@ -47,7 +47,7 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR
  .ENDIF			# "$(GUI)"=="WNT"
  .EXPORT: PYTHONPATH
@@ -119,8 +119,8 @@
  .IF "$(FORCE_DOWNLOADSETS)"!=""
 @@ -214,7 +214,11 @@ $(MAKETARGETS) : $(ADDDEPS)
  .IF "$(OS)" == "MACOSX"
- DMGDEPS=$(BIN)$/{osxdndinstall.png DS_Store}
- $(foreach,i,$(alllangiso) {openoffice openofficedev openofficewithjre broffice brofficedev brofficewithjre}_$i) : $(DMGDEPS)
+ DMGDEPS=$(BIN)$/{osxdndinstall.png DS_Store DS_Store_Langpack}
+ $(foreach,i,$(alllangiso) {openoffice openofficedev openofficewithjre ooolanguagepack broffice brofficedev brofficewithjre}_$i) : $(DMGDEPS)
 -.ENDIF # "$(OS)" == "MACOSX"
 +
 +BUILDROOT_LANGPACK=$(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice_languagepack$/install$/ $(@:b))