[tor-commits] [tor-browser/tor-browser-17.0.5esr-2] fixup! Tor Browser's Firefox preference overrides.

[mikeperry at torproject.org]

commit 1f590875b79e867f68c577089386301afd529c75
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed May 8 13:09:28 2013 -0700

    fixup! Tor Browser's Firefox preference overrides.
    
    Also attempt to change omni.ja ordering.
---
 browser/app/profile/tor-browser.js    |    2 +-
 toolkit/mozapps/installer/packager.mk |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/browser/app/profile/tor-browser.js b/browser/app/profile/tor-browser.js
index 87490f2..bcc5bad 100644
--- a/browser/app/profile/tor-browser.js
+++ b/browser/app/profile/tor-browser.js
@@ -111,7 +111,7 @@ pref("extensions.autoDisableScopes", 0);
 pref("extensions.bootstrappedAddons", "{}");
 pref("extensions.checkCompatibility.4.*", false);
 pref("extensions.databaseSchema", 3);
-pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,torlauncher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5"
+pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5"
 pref("extensions.enabledItems", "langpack-en-US at firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8");
 pref("extensions.enabledScopes", 1);
 pref("extensions.pendingOperations", false);
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 8460c91..01c7b93 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -496,11 +496,13 @@ OMNIJAR_FILES	= \
   $(NULL)
 
 # defaults/pref/channel-prefs.js is handled separate from other prefs due to
-# bug 756325
+# bug 756325.
+# tor-browser.js is also bundled last, because it must override other prefs.
 NON_OMNIJAR_FILES += \
   chrome/icons/\* \
   $(PREF_DIR)/channel-prefs.js \
   defaults/pref/channel-prefs.js \
+  defaults/preferences/tor-browser.js \
   res/cursors/\* \
   res/MainMenu.nib/\* \
   \*/.mkdir.done \
@@ -514,6 +516,7 @@ PACK_OMNIJAR	= \
     mv tmp.manifest $$m; \
   done; \
   $(ZIP) -r9m $(OMNIJAR_NAME) $(OMNIJAR_FILES) -x $(NON_OMNIJAR_FILES) && \
+  $(ZIP) -u $(OMNIJAR_NAME) defaults/preferences/tor-browser.js && \
   $(GENERATE_CACHE) && \
   $(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR_AB_CD) ./ ./ && \
   mv binary.manifest components && \