Backout all patches from bug 723176, because we still have problems with our CodeResources file.

browser/app/macbuild/Contents/CodeResources

@@ -1 +0,0 @@
-_CodeSignature/CodeResources

browser/app/macbuild/Contents/_CodeSignature/CodeResources

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>rules</key>
-        <dict>
-            <key>^Info.plist$</key>
-            <true/>
-            <key>^PkgInfo$</key>
-            <true/>
-            <key>^MacOS/</key>
-            <true/>
-            <key>^Resources/</key>
-            <true/>
-            <key>^MacOS/extensions/.*</key><dict>
-                <key>omit</key>
-                <true/>
-            </dict>
-            <key>^MacOS/distribution/.*</key><dict>
-                <key>omit</key>
-                <true/>
-            </dict>
-            <key>^MacOS/updates/.*</key><dict>
-                <key>omit</key>
-                <true/>
-            </dict>
-            <key>^MacOS/active-update.xml$</key><dict>
-                <key>omit</key>
-                <true/>
-            </dict>
-            <key>^MacOS/defaults/.*</key><dict>
-                <key>omit</key>
-                <true/>
-            </dict>
-            <key>^MacOS/mozilla.cfg$</key><dict>
-                <key>omit</key>
-                <true/>
-            </dict>
-            <key>^MacOS/removed-files$</key><dict>
-                <key>omit</key>
-                <true/>
-            </dict>
-            <key>^MacOS/updates.xml$</key><dict>
-                <key>omit</key>
-                <true/>
-            </dict>
-        </dict>
-    </dict>
-</plist>

browser/installer/package-manifest.in

@@ -24,8 +24,6 @@
 @APPNAME@/Contents/Info.plist
 @APPNAME@/Contents/PkgInfo
 @APPNAME@/Contents/Resources/
-@APPNAME@/Contents/CodeResources
-@APPNAME@/Contents/_CodeSignature/CodeResources
 #endif
 
 [@AB_CD@]

toolkit/locales/l10n.mk

@@ -74,8 +74,6 @@ endif
 include $(MOZILLA_DIR)/toolkit/mozapps/installer/signing.mk
 include $(MOZILLA_DIR)/toolkit/mozapps/installer/packager.mk
 
-PACKAGE_BASE_DIR = $(_ABS_DIST)/l10n-stage
-
 $(STAGEDIST): AB_CD:=en-US
 $(STAGEDIST): UNPACKAGE=$(call ESCAPE_SPACE,$(ZIP_IN))
 $(STAGEDIST): $(call ESCAPE_SPACE,$(ZIP_IN))

toolkit/mozapps/installer/packager.mk

@@ -46,7 +46,6 @@ STAGEPATH = universal/
 endif
 endif
 
-PACKAGE_BASE_DIR = $(_ABS_DIST)
 PACKAGE       = $(PKG_PATH)$(PKG_BASENAME)$(PKG_SUFFIX)
 
 # By default, the SDK uses the same packaging type as the main bundle,
@@ -554,15 +553,8 @@ MOZ_SIGN_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),
 endif
 
 ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD
-ifeq (Darwin, $(OS_ARCH)) 
-MAKE_PACKAGE    = $(PREPARE_PACKAGE) \
-				  && cd ./$(PKG_DMG_SOURCE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_MACBUNDLE_NAME)  && cd $(PACKAGE_BASE_DIR) \
-				  && $(INNER_MAKE_PACKAGE)
-else
 MAKE_PACKAGE    = $(PREPARE_PACKAGE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) \
 		  $(MOZ_PKG_DIR) && $(INNER_MAKE_PACKAGE)
-endif #Darwin
-
 else
 MAKE_PACKAGE    = $(PREPARE_PACKAGE) && $(INNER_MAKE_PACKAGE)
 endif

toolkit/mozapps/installer/signing.mk

@@ -23,7 +23,6 @@ SIGN_EXCLUDES := \
 endif # Windows
 
 ifeq (Darwin, $(OS_ARCH))
-MOZ_INTERNAL_SIGNING_FORMAT := dmg
 MOZ_EXTERNAL_SIGNING_FORMAT := gpg
 endif # Darwin