Bug 549246 - Go back to shipping run-mozilla.sh and the "firefox" script on OS X, r=ted

--HG--
extra : rebase_source : e9b91ffa42b8e02d23144aca84e0d773d6d5b1d0

browser/installer/package-manifest.in

@@ -73,10 +73,8 @@
 @BINPATH@/@MOZ_APP_NAME@.exe
 #else
 @BINPATH@/@MOZ_APP_NAME@-bin
-#ifndef XP_MACOSX
 @BINPATH@/@MOZ_APP_NAME@
 #endif
-#endif
 @BINPATH@/application.ini
 @BINPATH@/platform.ini
 #ifdef XP_MACOSX
@@ -99,9 +97,9 @@
 @BINPATH@/LICENSE
 @BINPATH@/blocklist.xml
 #ifdef XP_UNIX
+@BINPATH@/run-mozilla.sh
 #ifndef XP_MACOSX
 @BINPATH@/mozilla-xremote-client
-@BINPATH@/run-mozilla.sh
 #endif
 #endif
 #ifdef MOZ_SPLASHSCREEN
@@ -375,9 +373,11 @@
 
 ; shell icons
 #ifdef XP_UNIX
+#ifndef XP_MACOSX
 @BINPATH@/icons/*.xpm
 @BINPATH@/icons/*.png
 #endif
+#endif
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs