summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorRelease Engineers <releng@openoffice.org>2009-08-26 06:41:14 +0000
committerRelease Engineers <releng@openoffice.org>2009-08-26 06:41:14 +0000
commit491476018b252440a477cff272a52993d9a5c4cf (patch)
treebb247d8026aebaa2300152113fed5b47a821f6ed /instsetoo_native
parentf09524dfff4e7cbdc2422ea3290b3de7a0e0811c (diff)
CWS-TOOLING: integrate CWS native262
2009-08-18 16:35:06 +0200 is r275118 : #i102939# differ between ok-label and install-label 2009-08-13 17:24:47 +0200 is r274960 : #i102939# mac languagepacks 2009-08-13 17:22:22 +0200 is r274959 : #i102939# mac languagepacks 2009-08-13 17:15:01 +0200 is r274958 : #i102939# mac languagepacks 2009-08-13 17:13:36 +0200 is r274957 : #i102939# mac languagepacks 2009-08-13 17:12:57 +0200 is r274956 : #i102939# mac languagepacks 2009-08-13 17:12:20 +0200 is r274955 : #i102939# mac languagepacks 2009-08-13 17:11:41 +0200 is r274954 : #i102939# mac languagepacks 2009-08-13 17:10:52 +0200 is r274953 : #i102939# mac languagepacks
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/res/DS_Store_Langpackbin0 -> 12292 bytes
-rw-r--r--instsetoo_native/util/makefile.mk6
-rwxr-xr-xinstsetoo_native/util/pack.lst4
3 files changed, 5 insertions, 5 deletions
diff --git a/instsetoo_native/res/DS_Store_Langpack b/instsetoo_native/res/DS_Store_Langpack
new file mode 100644
index 000000000000..1b53eba75b74
--- /dev/null
+++ b/instsetoo_native/res/DS_Store_Langpack
Binary files differ
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 99ca8b140d51..fa9e97e5516e 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -217,8 +217,8 @@ $(MAKETARGETS) : $(ADDDEPS)
.ENDIF # "$(BUILD_SPECIAL)"!=""
.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"
.IF "$(PKGFORMAT)"!=""
@@ -384,7 +384,7 @@ $(BIN)$/broffice$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_nologo$/intro.zip
@-$(MKDIR) $(@:d)
$(COPY) $< $@
-$(BIN)$/{osxdndinstall.png DS_Store} : $(PRJ)$/res$/$$(@:f)
+$(BIN)$/{osxdndinstall.png DS_Store DS_Store_Langpack} : $(PRJ)$/res$/$$(@:f)
@$(COPY) $< $@
hack_msitemplates .PHONY:
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 4b7f1954f084..200bf3708f5a 100755
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -17,8 +17,8 @@ OpenOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pr
#OpenOffice_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoo
OpenOffice_Dev_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoodev
#URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure
-OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro de ooolanguagepack
-OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12 de ooolanguagepack
+OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de ooolanguagepack
+OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi de ooolanguagepack
OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro de|fr|ja|ar ooodevlanguagepack
#BrOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro pt-BR broolanguagepack