From 96fb1e22387af1cb0888a32fcb267463d64a898a Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Tue, 19 Oct 2010 17:42:55 +0200
Subject: native334 #163388# no more change of DS_Store file

---
 .../scripts/osx_install_languagepack.applescript    |   2 +-
 setup_native/scripts/osx_install_patch.applescript  |   2 +-
 setup_native/source/mac/Info.plist.langpack         |   6 +++---
 setup_native/source/mac/broffice/DS_Store           | Bin 12292 -> 12292 bytes
 setup_native/source/mac/ooo/DS_Store                | Bin 12292 -> 12292 bytes
 setup_native/source/mac/ooo/DS_Store_Langpack       | Bin 12292 -> 12292 bytes
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup_native/scripts/osx_install_languagepack.applescript b/setup_native/scripts/osx_install_languagepack.applescript
index 33d376ade..9fb4bdacb 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -45,7 +45,7 @@ if (button returned of result) is AbortLabel then
 	return 2
 end if
 
-set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLPRODUCTNAME].app'\"") & "
+set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"") & "
 " & chooseMyOwn
 
 -- the choice returned is of type "list"
diff --git a/setup_native/scripts/osx_install_patch.applescript b/setup_native/scripts/osx_install_patch.applescript
index 33a9d4126..e9dbd442d 100644
--- a/setup_native/scripts/osx_install_patch.applescript
+++ b/setup_native/scripts/osx_install_patch.applescript
@@ -43,7 +43,7 @@ if (button returned of result) is AbortLabel then
 	return 2
 end if
 
-set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLPRODUCTNAME].app'\"") & "
+set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"") & "
 " & chooseMyOwn
 
 -- the choice returned is of type "list"
diff --git a/setup_native/source/mac/Info.plist.langpack b/setup_native/source/mac/Info.plist.langpack
index 3c1eb2c6f..38fc794aa 100644
--- a/setup_native/source/mac/Info.plist.langpack
+++ b/setup_native/source/mac/Info.plist.langpack
@@ -10,9 +10,9 @@
 	<key>UTImportedTypeDeclarations</key>
 	
 	<key>CFBundleExecutable</key>
-	<string>[FULLPRODUCTNAME]</string>
+	<string>[FULLAPPPRODUCTNAME]</string>
 	<key>CFBundleGetInfoString</key>
-	<string>[FULLPRODUCTNAME]</string>
+	<string>[FULLAPPPRODUCTNAME]</string>
 	<key>CFBundleIconFile</key>
 	<string>ooo3_installer.icns</string>
 	<key>CFBundleShortVersionString</key>
@@ -22,7 +22,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>[FULLPRODUCTNAME]</string>
+	<string>[FULLAPPPRODUCTNAME]</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
diff --git a/setup_native/source/mac/broffice/DS_Store b/setup_native/source/mac/broffice/DS_Store
index b0407ef50..a534e3bed 100644
Binary files a/setup_native/source/mac/broffice/DS_Store and b/setup_native/source/mac/broffice/DS_Store differ
diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store
index e722b546e..dae0af0a4 100644
Binary files a/setup_native/source/mac/ooo/DS_Store and b/setup_native/source/mac/ooo/DS_Store differ
diff --git a/setup_native/source/mac/ooo/DS_Store_Langpack b/setup_native/source/mac/ooo/DS_Store_Langpack
index 3a8ad71a5..21b08ffb1 100644
Binary files a/setup_native/source/mac/ooo/DS_Store_Langpack and b/setup_native/source/mac/ooo/DS_Store_Langpack differ
-- 
cgit v1.2.3


From 3528de4e8523c9d83fb600853a34bcc8cb9ec6dd Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Tue, 19 Oct 2010 17:49:20 +0200
Subject: native334 #i113163# trivial fix

---
 setup_native/scripts/admin.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl
index 466182b24..d90c76650 100644
--- a/setup_native/scripts/admin.pl
+++ b/setup_native/scripts/admin.pl
@@ -66,7 +66,6 @@ sub usage
 {
     print <<Ende;
 ----------------------------------------------------------------------
-$prog V1.0 (c) Sun Microsystems 2009
 This program installs a Windows Installer installation set
 without using msiexec.exe. The installation is comparable
 with an administrative installation using the Windows Installer
-- 
cgit v1.2.3