libre/iceweasel-libre: update to 18.0.1, simplify libre.patch

This means * tweaking the depends * removing now-upstream patches libre.patch: * use vendor.js for some of it * use a sed script for other parts
author: Luke Shumaker <LukeShu@sbcglobal.net> 2013-01-12 17:56:54 -0500
committer: Luke Shumaker <LukeShu@sbcglobal.net> 2013-01-12 17:56:54 -0500
commit: 005cec01792d1fc62eb011ea35acad0f6d9cb70e (patch)
tree: 8c9c61b3c0dcdead7fd681ddaac41523162855cb /libre/iceweasel-libre
parent: f996597c6b79f714ec28ef04bd3fbd4d18bf2046 (diff)
8 files changed, 218 insertions, 963 deletions
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
deleted file mode 100644
index 69fe5c072..000000000
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-From: Mike Hommey <mh@glandium.org>
-Date: Tue, 5 Jun 2012 08:57:06 +0200
-Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
-
-diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
-index 0e8ccf5..fa46c08 100644
---- a/browser/components/migration/content/migration.js
-+++ b/browser/components/migration/content/migration.js
-@@ -249,7 +249,7 @@ var MigrationWizard = {
-     }
- 
-     var brandBundle = document.getElementById("brandBundle");
--    // These strings don't exist when not using official branding. If that's
-+    // These strings may not exist when not using official branding. If that's
-     // the case, just skip this page.
-     try {
-       var pageTitle = brandBundle.getString("homePageMigrationPageTitle");
-@@ -281,8 +281,8 @@ var MigrationWizard = {
-       case "chrome":
-         source = "sourceNameChrome";
-         break;
--      case "firefox":
--        source = "sourceNameFirefox";
-+      case "self":
-+        source = "brand";
-         break;
-     }
- 
-@@ -292,7 +292,12 @@ var MigrationWizard = {
-     var oldHomePageURL = this._migrator.sourceHomePageURL;
- 
-     if (oldHomePageURL && source) {
--      var appName = MigrationUtils.getLocalizedString(source);
-+      var appName;
-+      if (source == "brand") {
-+        appName = brandBundle.GetStringFromName("brandFullName");
-+      } else {
-+        appName = MigrationUtils.getLocalizedString(source);
-+      }
-       var oldHomePageLabel =
-         brandBundle.getFormattedString("homePageImport", [appName]);
-       var oldHomePage = document.getElementById("oldHomePage");
-diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
-index f030756..23e37ff 100644
---- a/browser/components/migration/content/migration.xul
-+++ b/browser/components/migration/content/migration.xul
-@@ -42,7 +42,7 @@
- #elifdef XP_UNIX
-       <radio id="chrome"    label="&importFromChrome.label;"    accesskey="&importFromChrome.accesskey;"/>
- #endif
--      <radio id="firefox"   label="&importFromFirefox.label;"   accesskey="&importFromFirefox.accesskey;"/>
-+      <radio id="self"      hidden="true"/>
-       <radio id="nothing"   label="&importFromNothing.label;"   accesskey="&importFromNothing.accesskey;" hidden="true"/>
-     </radiogroup>
-     <label id="noSources" hidden="true">&noMigrationSources.label;</label>
-diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
-index d7fec75..d531b83 100644
---- a/browser/components/migration/src/BrowserProfileMigrators.manifest
-+++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
-@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
- component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
- contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
- component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
--contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
-+contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
- #ifdef HAS_IE_MIGRATOR
- component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
- contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
-diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index a6598fe..8f83da8 100644
---- a/browser/components/migration/src/FirefoxProfileMigrator.js
-+++ b/browser/components/migration/src/FirefoxProfileMigrator.js
-@@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
- 
- 
- FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
--FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";
-+FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
- FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
- 
- const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
-diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
-index 0669aa8..19552e3 100644
---- a/browser/components/migration/src/MigrationUtils.jsm
-+++ b/browser/components/migration/src/MigrationUtils.jsm
-@@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({
-    * @see nsIStringBundle
-    */
-   getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
--    const OVERRIDES = {
--      "4_firefox": "4_firefox_history_and_bookmarks"
--    };
--    aKey = OVERRIDES[aKey] || aKey;
--
-     if (aReplacements === undefined)
-       return getMigrationBundle().GetStringFromName(aKey);
-     return getMigrationBundle().formatStringFromName(
-@@ -622,6 +617,17 @@ let MigrationUtils = Object.freeze({
-   },
- 
-   /**
-+   * Returns whether a given migration type is supported.
-+   *
-+   * @param  aKey   Migrator key
-+   * @returns whether the migrator key is supported.
-+   */
-+  canMigrate:
-+  function MU_canMigrate(aMigratorKey) {
-+    return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
-+  },
-+
-+  /**
-    * Cleans up references to migrators and nsIProfileInstance instances.
-    */
-   finishMigration: function MU_finishMigration() {
-diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
-index 744f117..59e5a4c 100644
---- a/browser/components/migration/src/ProfileMigrator.js
-+++ b/browser/components/migration/src/ProfileMigrator.js
-@@ -12,6 +12,7 @@ function ProfileMigrator() {
- 
- ProfileMigrator.prototype = {
-   migrate: MigrationUtils.startupMigration.bind(MigrationUtils),
-+  canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),
-   QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),
-   classDescription: "Profile Migrator",
-   contractID: "@mozilla.org/toolkit/profile-migrator;1",
-diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-index 21cf405..f3c1a6b 100644
---- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
-+++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-@@ -17,8 +17,6 @@
- <!ENTITY importFromSafari.accesskey     "S">
- <!ENTITY importFromChrome.label         "Chrome">
- <!ENTITY importFromChrome.accesskey     "C">
--<!ENTITY importFromFirefox.label        "Firefox">
--<!ENTITY importFromFirefox.accesskey    "X">
- 
- <!ENTITY noMigrationSources.label       "No programs that contain bookmarks, history or password data could be found.">
- 
-diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
-index 260bc29..52b32cc 100644
---- a/browser/locales/en-US/chrome/browser/migration/migration.properties
-+++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
-@@ -8,7 +8,6 @@ profileName_format=%S %S
- sourceNameIE=Internet Explorer
- sourceNameSafari=Safari
- sourceNameChrome=Google Chrome
--sourceNameFirefox=Mozilla Firefox
- 
- importedBookmarksFolder=From %S
- 
-@@ -24,22 +23,22 @@ importedSafariReadingList=Reading List (From Safari)
- 2_ie=Cookies
- 2_safari=Cookies
- 2_chrome=Cookies
--2_firefox=Cookies
-+2_self=Cookies
- 
- 4_ie=Browsing History
- 4_safari=Browsing History
- 4_chrome=Browsing History
--4_firefox_history_and_bookmarks=Browsing History and Bookmarks
-+4_self=Browsing History and Bookmarks
- 
- 8_ie=Saved Form History
- 8_safari=Saved Form History
- 8_chrome=Saved Form History
--8_firefox=Saved Form History
-+8_self=Saved Form History
- 
- 16_ie=Saved Passwords
- 16_safari=Saved Passwords
- 16_chrome=Saved Passwords
--16_firefox=Saved Passwords
-+16_self=Saved Passwords
- 
- 32_ie=Favorites
- 32_safari=Bookmarks
-@@ -48,4 +47,4 @@ importedSafariReadingList=Reading List (From Safari)
- 64_ie=Other Data
- 64_safari=Other Data
- 64_chrome=Other Data
--64_firefox=Bookmarks Backups
-+64_self=Bookmarks Backups
-diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 339ffda..6999b26 100644
---- a/toolkit/content/jar.mn
-+++ b/toolkit/content/jar.mn
-@@ -38,7 +38,7 @@ toolkit.jar:
- +  content/global/mozilla.xhtml               (mozilla.xhtml)
-    content/global/nsDragAndDrop.js            (nsDragAndDrop.js)
-    content/global/resetProfile.css            (resetProfile.css)
--*  content/global/resetProfile.js             (resetProfile.js)
-+   content/global/resetProfile.js             (resetProfile.js)
-    content/global/resetProfile.xul            (resetProfile.xul)
-    content/global/resetProfileProgress.xul    (resetProfileProgress.xul)
-    content/global/treeUtils.js                (treeUtils.js)
-diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
-index dcb4065..09c1146 100644
---- a/toolkit/content/resetProfile.js
-+++ b/toolkit/content/resetProfile.js
-@@ -36,13 +36,13 @@ function resetSupported() {
-                        getService(Ci.nsIToolkitProfileService);
-   let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
- 
--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
--
-   // Reset is only supported for the default profile if the self-migrator used for reset exists.
-   try {
--    return currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
--             ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc);
-+    if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
-+        "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
-+      let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
-+      return ("canMigrate" in pm) && pm.canMigrate("self");
-+    }
-   } catch (e) {
-     // Catch exception when there is no selected profile.
-     Cu.reportError(e);
-@@ -53,9 +53,6 @@ function resetSupported() {
- function getMigratedData() {
-   Components.utils.import("resource:///modules/MigrationUtils.jsm");
- 
--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
--
-   // From migration.properties
-   const MIGRATED_TYPES = [
-     4,  // History and Bookmarks
-@@ -68,7 +65,7 @@ function getMigratedData() {
-   let dataTypes = [];
-   for (let itemID of MIGRATED_TYPES) {
-     try {
--      let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);
-+      let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
-       dataTypes.push(typeName);
-     } catch (x) {
-       // Catch exceptions when the string for a data type doesn't exist.
-diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
-index f35c227..7062886 100644
---- a/toolkit/profile/nsIProfileMigrator.idl
-+++ b/toolkit/profile/nsIProfileMigrator.idl
-@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports
-  * @client   Toolkit (Startup code)
-  * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")
-  */
--[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]
-+[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]
- interface nsIProfileMigrator : nsISupports 
- {
-   /**
-@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports
-    * @note The startup code ignores COM exceptions thrown from this method.
-    */
-   void migrate(in nsIProfileStartup aStartup, in ACString aKey);
-+
-+  /**
-+   * Returns whether a given migration type is supported.
-+   *
-+   * @param  aKey   Migrator key
-+   * @returns whether the migrator key is supported.
-+   */
-+  bool canMigrate(in ACString aKey);
- };
- 
- %{C++
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 68a52e6..02bb30e 100644
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
-         if (gDoProfileReset) {
-           // Automatically migrate from the current application if we just
-           // reset the profile.
--          aKey = MOZ_APP_NAME;
-+          aKey = "self";
-         }
-         pm->Migrate(&mDirProvider, aKey);
-       }
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index c1c7d393c..baa53d015 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -19,7 +19,7 @@
 _pgo=false
 
 _debname=iceweasel
-_debver=17.0.1
+_debver=18.0
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main
 
@@ -30,7 +30,7 @@ _locales=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-G
 pkgbase=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=4
+pkgrel=1
 
 ######################################################################
 
@@ -68,7 +68,7 @@ depends=(
   'mime-types'
   'mozilla-common'
   'mozilla-searchplugins'
-  'nss>=3.13.3'
+  'nss>=3.14.1'
   'sqlite'
   'startup-notification'
 )
@@ -84,7 +84,6 @@ makedepends=(
   'mesa'
   'python2'
   'unzip'
-  'wireless_tools'
   'zip'
 )
 [[ $CARCH != mips64el ]] && makedepends+=('yasm')
@@ -92,7 +91,7 @@ if $_pgo; then
   makedepends+=('xorg-server-xvfb')
   options+=(!ccache)
 fi
-optdepends=('wireless_tools: Location detection via available WiFi networks')
+optdepends=('networkmanager: Location detection via available WiFi networks')
 url="http://packages.debian.org/source/experimental/$_debname"
 install=firefox.install
 options=(!emptydirs)
@@ -101,16 +100,8 @@ source=($(debfile ${_debname}_${_debver}-${_debrel}.dsc)
         $(debfile ${_debname}_${_debver}.orig.tar.bz2)
         $(debfile ${_debname}_${_debver}.orig-compare-locales.tar.bz2)
         $(for locale in "${_locales[@]}"; do debfile ${_debname}_${_debver}.orig-l10n-${locale}.tar.bz2; done)
-        mozconfig
-        mozconfig.pgo
-        xulrunner-copy-stub.patch
-        libre.patch
-        iceweasel-install-dir.patch
-        vendor.js
-        shared-libs.patch
-        Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-        $pkgbase.desktop
-)
+        replace-urls.txt libre.patch mozconfig.pgo
+        mozconfig $pkgbase.desktop iceweasel-install-dir.patch vendor.js shared-libs.patch)
 # use dpkg-source to extract everything
 noextract=(); for file in "${source[@]}"; do noextract+=("${file##*/}"); done
 
@@ -138,10 +129,20 @@ prepare() {
   dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc mozilla-release
   cd mozilla-release
 
-  patch -Np1 -i ../Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
   patch -Np1 -i ../iceweasel-install-dir.patch
-  patch -Np1 -i ../xulrunner-copy-stub.patch
   patch -Np1 -i ../shared-libs.patch
+
+  # Replace common URLs
+  sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
+    if [[ -n $moz_url ]]; then
+      printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url"
+      grep -Erl "${moz_url}" \
+        --exclude='*.'{patch,orig,rej} \
+        --exclude-dir={.pc,test,tests,testing} \
+        | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
+    fi
+  done
+
   patch -Np1 -i ../libre.patch
 
   # Fix PRE_RELEASE_SUFFIX
@@ -166,6 +167,12 @@ build_browser() {
   if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi
   if [[ $CARCH  == mips64el ]]; then mips64el-configure; fi
 
+  # WebRTC build tries to execute "python" and expects Python 2
+  # Workaround taken from chromium PKGBUILD
+  mkdir "$srcdir/python2-path"
+  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+  export PATH="$srcdir/python2-path:$PATH"
+
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
   export PYTHON="/usr/bin/python2"
   export MOZ_MAKE_FLAGS="$MAKEFLAGS"
@@ -235,104 +242,103 @@ package() {
   ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin"
 }
 
-md5sums=('7fe75c8797381adf9f0845d88064e24a'
-         '1bbf435ff33f9824de23c0b13fbfb452'
-         '37b9b7eafc8affa9b8a5942f8ff19f8f'
+md5sums=('263569a577f72314694a711cc6a0d96f'
+         '6a571d3a3b355c331f67d57702f4fccf'
+         '366e1e4847d7e00eba77ee5a4be0d3db'
          '80dd4a702302fb36719c67445b487895'
          'c99d7605c0e0bb0d77e71cd54f305a9a'
          '1f4aeabf6c28fcf6539d13f65f8b366b'
          'cb9cc5f721d81442f1a93d134054f23c'
-         'f926850d2071114f4ba719230ce43168'
-         '8c414a4f8d6d137dcca41b203fce4d0c'
+         'c69e0fa169bf6c49b1f83afd2383b628'
+         '09f4376791d17a772c60a0308095211d'
          'a16081e4da9daf6df5f6fcce2000cec1'
          '88dd4c5837485acea83e97f3cb4f1e31'
          '8751f0a634656ba973c53f96d1fa34e1'
-         'a3905a8a62c0b5ba4c11fee49ad6d184'
+         'f4531f867e6e75501bac3d7ed5f09045'
          '740667ba651f0562b45bbfe63b8ec84e'
-         '85a7a4de61e5546487dae32849ae63f2'
+         'a1f3637341457fb8272d126f1aa70e4b'
          '3d00ad2734c890930441d6cd919f11c8'
-         '80a49422e0973ed8d6fd7920cf0a4379'
+         '84b7a2bf7f1458b60e9552d04c7e84b2'
          '30ce51ca764b091c59df5c08e35e8a7f'
-         '3fdbb51a5cbea3f6a7c43534a8c67d5a'
+         '1291e5976c83a8cda1903e4443d44c8e'
          '1eacf81985d9993b2b94f98fd4c453e0'
-         'ccd6c210bf596909137c4159580042eb'
-         '688c3eeca95418703bf6c2cb0dbe18d0'
-         '3830cab7a1b48890588cfbeb42444a22'
-         '6924436432149b668e14c3595602af79'
+         '07b91907c98155c1b95e5d7f47367fde'
+         'cd4042405f6eaa2931021f745f49d91f'
+         '24f8a5d05d0d2485c30b46e6d6835330'
+         '1b95f32637229a86e4633994350cf76f'
          'ae6007384d85dbd14fbe6496e0b9e47b'
-         '3859dac30bf0ec9d49419c83b116407e'
-         '4c200fc11efb425ba1ed0c6254f323a5'
+         'a8ef67c04d3dc263f0f58e877b13cd71'
+         'b5c3b2e366aa776e574d0972df72a423'
          '200f856b50a7485a1d5447cbf8dee77c'
-         '5b8d0c552c0ca7abb48ef4e94908edd2'
+         '1767400f27cf010572308f949e56176e'
          'c6dde21438789ccf4c666afc22ee713c'
-         'b234e98c5155fb597fa6f5b1242492ec'
-         '5abfc72599632a0ac85f18b4f706ee71'
-         'a78698a63ef66d5532601f76f48613c3'
-         'cca18bf0e95da80578d1e71a7592a545'
-         '9213e16598b0595710583956fa95dfff'
-         '120a4a00c1775a8445d35266b3157112'
-         'cf94d425550530b34e355ed445618626'
+         'd202408658b9e7e7a2656dd874ac0712'
+         '1c463a18e2a395314f7d0ad72282d5aa'
+         'ec222722f432e8a94f993c1c32cd9757'
+         'cf44fd1d567a7638fc0b5b80bb0398f7'
+         '13151197d7ef349699e55c760c74af16'
+         '32c185ef506e439bb63f572906a9bf66'
+         '2e6b90b3c6cad17753ec1aecaf61073c'
          'dbf451ef9ecf1816973ac4dffe7e2b8e'
-         '87a12e25b99886ac25cb0d9f0ca201ad'
+         '85c0900fb798fb64a8883dba06deccc0'
          '0efff47ab838fd320c710ffd46ee3a57'
          '28e5d445e7a91ddd64d50478b05edb51'
          '770dcdf1a8d6d2db64dadb6e4f6149fb'
          '7732b021cdf73ace33cb41609b327f3d'
-         'ac79148f7bbdeff056d10cf0542f6ea0'
-         '4718bff38f0a6c8ec7b41df148255f34'
+         '3a195266b43e9f477619aac9c326a26b'
+         'a55e22c7ab045826b331efd7c0f036ef'
          '2edcd565c19828e3d4a2da19f8529edd'
          '531c54a91d509e768b55bfd88a96a527'
-         'c8a4d346560350fd45533e52c0e6a15e'
-         '707d055b9d86ba16b2a44376a6cf3fb9'
-         '66b2b23c7e16840554521c748a22d083'
-         '61e53be2eeb528742c19d3a13252a961'
-         '89c23536240f86a776fb62728297e13d'
+         'ddf2182b6e33795450bf41f46e7be521'
+         '8bf4edabc95abbaf274ddd5e5c5db562'
+         '63a227dbab0e66b6a0d4804c419049e2'
+         '3c9bab1f629c0b079345a186c0f22afc'
+         '786a62179094cda5f5e831232f4f94ce'
          '535f68d0cfa4dee9df0cddbee42a4c94'
-         '7c91dc4f2bbcdac2f8547caad24516ea'
+         'ffc4c457dfa697162e4198e61ae19e3b'
          '4476b94e676b3cfb309f972f7c42da1b'
          '792700b40ba53de7de5b48187b604b29'
-         '500861d2d8bebc85596a3ee343adb75e'
-         'b2f5d243b28a9137189b6fa001c0207e'
-         'a36a7b1785532e659d3b972e4e767f45'
+         '7f71fa7bed8488226168406ac022d2fd'
+         'fdd9a144cd2a630d1b7ab6b73315c548'
+         '88d668eccb111a9e4f5fde58e000a5aa'
          '46509bb591bf54b6fed025814bfc11bf'
          '715a3f8c2fcdab17b24ce61f55c49183'
          '658226211d66a724d0335a173ef8512f'
          'ecb41c7536c95cf2ca118d7ab6b7d357'
-         '3b832ba3a5d1543809395171e5a105f6'
-         '46380a60795095514004bc19c512e1c5'
+         'b813931cfba36f3b00826ba2d36e648f'
+         '2a926d37294ab24a7d7dc879339ae736'
          'fba979124cd393f1164a59e3b9183ccc'
-         'db0e3b1146b0350e23e35958ee896aa5'
+         'e8597a5af1643b9c9a0b02a3756e0a86'
          '665140babab027228eb195b6c0e83d4e'
          'e71a740bfc52d25968f8e2c4c1896897'
          '47bd00559728578bfc257b80c72ce393'
-         '0b77be5ee8a66f5b819f9bf032f1b744'
-         '38df23959bd6940a82e78f76a00cc973'
-         'b6c74d7b9cf5f6722c661bdba78c3769'
+         '3a3d846613363e6d4dd99326cd07417d'
+         '80daf692c2fa80ef7f528df2a6aed42e'
+         '25c03afb8f5086a07eb0e26c94bcbc01'
          '481db49b914f33d6c594ecebbc291e4c'
-         '6a680e3aa71a39a1d59f877535eb7bbc'
+         '742d2af843536fc1cdc8560b5aa0620f'
          '9ee935f09dc89b42db9ad8db3473717d'
-         'e9ad600f21766465aed4ae8473290077'
-         'b70d217d69692ea3fb26e87fa468f4eb'
+         'cf3e65e4db50dfa467defb4f820cd378'
+         '3e0c8ea5b69c4363e40c21dda5230850'
          '32b73226e95ae47dc11a554a7208d960'
-         '5b78c67c024c683f4c0f1bc9931a2b28'
+         '437602c23394eb02ae5fe03ca4fd29bc'
          'f7a347a3d5679d82340d227474de938f'
-         '2939f738602daee17e63e14374db86be'
+         '1a898825183ed67ea72b67a2c3486dd4'
          '73bead055152cd4885b9834691c9066a'
          '722a0d2212060e2044cbac859db3e063'
-         '8f259efea0bf1b67fd4b4dae492e2e00'
+         'fba01f51ac90dec18758a7468fb509e1'
          '03c2a59eab8ef4ad3687b91c07f96165'
-         '726317125b44225273307235f609d341'
+         'd502ec35e4ec26d7f538f4b96402fe9c'
          'b75b729e9ab3ff9a908115ab520339a9'
          'cd696e70fdb4f5ab9d50040abea46b82'
-         'cdd2dba79e929e6585799d7f3f7fa7d4'
-         '0b611a362d7e566805c2df474ff407b6'
+         '1b9df937ef08b6a72ca7d659f91df099'
+         '17bbe91d26b302aa36391ed57199006d'
          'de6037c0a65e7b86e0929637156ba587'
-         'ec03a45c3b403786c91f0d44357f321c'
+         'a8fc4658d45b6bf9350023e5c3f34e56'
+         '8f96efe6c0257c8049bbe4bc85d42994'
          'e4cd438a0b2a42dfb14bc7716e901e5f'
-         'a485a2b5dc544a8a2bd40c985d2e5813'
-         'c8040002668fae7d1b950833bae51607'
-         'abf5ecb74caa857abb42bcfbb3442d9c'
-         '0d053487907de4376d67d8f499c5502b'
-         '52e52f840a49eb1d14be1c0065b03a93'
-         '65f68090d2a69b467bd2707d0c4ea3bd'
-         '39d8b9249c5effe5fe24d2e9f80a9a94')
+         '5bfaf77580b6d3ce185b4c3ad4fa30ca'
+         '39d8b9249c5effe5fe24d2e9f80a9a94'
+         '2baf8cffccd50c568ad153a709cb3136'
+         'e9b4ec9a34bdab1854255aaa05e7cedd'
+         '52e52f840a49eb1d14be1c0065b03a93')
diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel-libre/iceweasel-install-dir.patch
index a44aef496..0524c8e5e 100644
--- a/libre/iceweasel-libre/iceweasel-install-dir.patch
+++ b/libre/iceweasel-libre/iceweasel-install-dir.patch
@@ -1,6 +1,6 @@
-diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk
---- iceweasel-16.0.1.orig/config/baseconfig.mk	2012-10-10 19:42:45.000000000 -0200
-+++ iceweasel-16.0.1/config/baseconfig.mk	2012-10-12 05:40:32.346949927 -0200
+diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk
+--- mozilla-release.orig/config/baseconfig.mk	2012-10-09 07:34:41.762092280 +0000
++++ mozilla-release/config/baseconfig.mk	2012-10-09 07:40:53.052771576 +0000
 @@ -1,10 +1,10 @@
  INCLUDED_AUTOCONF_MK = 1
  
@@ -16,9 +16,9 @@ diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/bas
  DIST = $(DEPTH)/dist
  
  # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nur iceweasel-16.0.1.orig/js/src/config/baseconfig.mk iceweasel-16.0.1/js/src/config/baseconfig.mk
---- iceweasel-16.0.1.orig/js/src/config/baseconfig.mk	2012-10-10 19:43:05.000000000 -0200
-+++ iceweasel-16.0.1/js/src/config/baseconfig.mk	2012-10-12 05:08:23.064066227 -0200
+diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release.orig/js/src/config/baseconfig.mk	2012-10-09 07:34:58.411973276 +0000
++++ mozilla-release/js/src/config/baseconfig.mk	2012-10-09 07:39:55.143186168 +0000
 @@ -1,7 +1,7 @@
  INCLUDED_AUTOCONF_MK = 1
  
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index cd3d49f2f..1f028d8b7 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,470 +1,37 @@
-diff -urN iceweasel-17.0.1.orig/browser/app/profile/firefox.js iceweasel-17.0.1/browser/app/profile/firefox.js
---- iceweasel-17.0.1.orig/browser/app/profile/firefox.js	2012-11-29 02:43:23.000000000 -0200
-+++ iceweasel-17.0.1/browser/app/profile/firefox.js	2012-12-04 17:00:51.691456154 -0200
-@@ -37,11 +37,10 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
- 
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -194,7 +193,8 @@
- pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
-                                             // Themes every day
- // Non-symmetric (not shared by extensions) extension-specific [update] preferences
--pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
-+pref("extensions.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html#addons");
-+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes");
- pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
- pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
-                                                 // restart.
-@@ -329,18 +328,18 @@
- pref("browser.download.panel.removeFinishedDownloads", false);
- 
- // search engines URL
--pref("browser.search.searchEnginesURL",      "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
-+pref("browser.search.searchEnginesURL",      "http://www.gnu.org/software/gnuzilla/addons.html#search%20engines");
- 
- // pointer to the default engine name
--pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
-+pref("browser.search.defaultenginename",      "chrome://branding/locale/browserconfig.properties");
- 
- // disable logging for the search service by default
- pref("browser.search.log", false);
- 
- // Ordering of Search Engines in the Engine list. 
--pref("browser.search.order.1",                "chrome://browser-region/locale/region.properties");
--pref("browser.search.order.2",                "chrome://browser-region/locale/region.properties");
--pref("browser.search.order.3",                "chrome://browser-region/locale/region.properties");
-+pref("browser.search.order.1",                "chrome://branding/locale/browserconfig.properties");
-+pref("browser.search.order.2",                "chrome://branding/locale/browserconfig.properties");
-+pref("browser.search.order.3",                "chrome://branding/locale/browserconfig.properties");
- 
- // search bar results always open in a new tab
- pref("browser.search.openintab", false);
-@@ -571,7 +570,7 @@
- pref("accessibility.typeaheadfind.flashBar", 1);
- 
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
- 
- // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
- pref("plugins.hide_infobar_for_missing_plugin", false);
-@@ -624,23 +623,23 @@
- pref("browser.send_pings", false);
- 
- /* initial web feed readers list */
--pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties");
--pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.0.title", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.contentHandlers.types.0.uri", "chrome://branding/locale/browserconfig.properties");
- pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed");
--pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties");
--pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.1.title", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.contentHandlers.types.1.uri", "chrome://branding/locale/browserconfig.properties");
- pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed");
--pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties");
--pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.2.title", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.contentHandlers.types.2.uri", "chrome://branding/locale/browserconfig.properties");
- pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed");
--pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties");
--pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.3.title", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.contentHandlers.types.3.uri", "chrome://branding/locale/browserconfig.properties");
- pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed");
--pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties");
--pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.4.title", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.contentHandlers.types.4.uri", "chrome://branding/locale/browserconfig.properties");
- pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed");
--pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties");
--pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties");
-+pref("browser.contentHandlers.types.5.title", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.contentHandlers.types.5.uri", "chrome://branding/locale/browserconfig.properties");
- pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed");
- 
- pref("browser.feeds.handler", "ask");
-@@ -651,7 +650,7 @@
- // region.properties file is newer than the version number in the handler
- // service datastore, it will add any new handlers it finds in the prefs (as
- // seeded by this file) to its datastore.  
--pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.defaultHandlersVersion", "chrome://branding/locale/browserconfig.properties");
- 
- // The default set of web-based protocol handlers shown in the application
- // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers
-@@ -659,65 +658,65 @@
- // protocol not currently listed here), we should go ahead and add those.
- 
- // webcal
--pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.schemes.webcal.0.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.1.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.2.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.3.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
- 
- // mailto
--pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.schemes.mailto.0.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.1.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.2.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.3.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
- 
- // irc
--pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.schemes.irc.0.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.1.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.2.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.3.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
- 
- // ircs
--pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties");
--pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties");
-+pref("gecko.handlerService.schemes.ircs.0.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.1.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.2.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.3.name", "chrome://branding/locale/browserconfig.properties");
-+pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://branding/locale/browserconfig.properties");
- 
- // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287
- pref("gecko.handlerService.allowRegisterFromDifferentHost", false);
- 
- #ifdef MOZ_SAFE_BROWSING
--pref("browser.safebrowsing.enabled", true);
--pref("browser.safebrowsing.malware.enabled", true);
-+pref("browser.safebrowsing.enabled", false);
-+pref("browser.safebrowsing.malware.enabled", false);
- pref("browser.safebrowsing.debug", false);
- 
--pref("browser.safebrowsing.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
--pref("browser.safebrowsing.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
--pref("browser.safebrowsing.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
--pref("browser.safebrowsing.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?");
--pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%");
--pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%");
--pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%");
--pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
--pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
-+pref("browser.safebrowsing.updateURL", "");
-+pref("browser.safebrowsing.keyURL", "");
-+pref("browser.safebrowsing.gethashURL", "");
-+pref("browser.safebrowsing.reportURL", "");
-+pref("browser.safebrowsing.reportGenericURL", "");
-+pref("browser.safebrowsing.reportErrorURL", "");
-+pref("browser.safebrowsing.reportPhishURL", "");
-+pref("browser.safebrowsing.reportMalwareURL", "");
-+pref("browser.safebrowsing.reportMalwareErrorURL", "");
- 
--pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/");
--pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
-+pref("browser.safebrowsing.warning.infoURL", "");
-+pref("browser.safebrowsing.malware.reportURL", "");
- 
- // Name of the about: page contributed by safebrowsing to handle display of error
- // pages on phishing/malware hits.  (bug 399233)
-@@ -1164,13 +1167,3 @@
- // might keep around more than this, but we'll try to get down to this value).
+diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
+--- mozilla-release.orig/browser/app/profile/firefox.js	2013-01-10 20:20:02.000000000 -0500
++++ mozilla-release/browser/app/profile/firefox.js	2013-01-10 17:47:34.000000000 -0500
+@@ -1168,11 +1168,9 @@
  // (This is intentionally on the high side; see bug 746055.)
  pref("image.mem.max_decoded_image_kb", 256000);
--
+ 
 -// Example social provider
 -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}");
--// Comma-separated list of nsIURI::prePaths that are allowed to activate
--// built-in social functionality.
+ // Comma-separated list of nsIURI::prePaths that are allowed to activate
+ // built-in social functionality.
 -pref("social.activation.whitelist", "https://www.facebook.com");
--pref("social.sidebar.open", true);
--pref("social.sidebar.unload_timeout_ms", 10000);
--pref("social.active", false);
--pref("social.toast-notifications.enabled", true);
-diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties
---- iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-20 00:45:50.000000000 -0200
-+++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-28 21:45:00.486713730 -0200
-@@ -3,25 +3,18 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo HTML
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
--browser.search.order.3=Bing
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=Google
--browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
--browser.contentHandlers.types.1.title=My Yahoo!
--browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-+browser.search.order.1=DuckDuckGo HTML
-+browser.search.order.2=DuckDuckGo Lite
-+browser.search.order.3=Seeks Search
- 
- # URL for site-specific search engines
- # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
- # to be searched and the user's search query. Place them in the appropriate location
- # for your locale's URL but do not translate them.
--browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
- 
- # increment this number when anything gets changed in the list below.  This will
- # cause Firefox to re-read these prefs and inject any new handlers into the 
-@@ -30,20 +23,10 @@
- # don't make any spelling errors here.
- gecko.handlerService.defaultHandlersVersion=3
- 
--# The default set of protocol handlers for webcal:
--gecko.handlerService.schemes.webcal.0.name=30 Boxes
--gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
--
--# The default set of protocol handlers for mailto:
--gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
--gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
--gecko.handlerService.schemes.mailto.1.name=Gmail
--gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
--
- # The default set of protocol handlers for irc:
--gecko.handlerService.schemes.irc.0.name=Mibbit
--gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.schemes.irc.0.name=Freenode
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
- 
- # The default set of protocol handlers for ircs:
--gecko.handlerService.schemes.ircs.0.name=Mibbit
--gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
-+gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
-diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html
---- iceweasel-13.0.orig/build/pgo/blueprint/elements.html	2012-06-01 09:03:49.000000000 -0300
-+++ iceweasel-13.0/build/pgo/blueprint/elements.html		2012-06-05 20:37:22.059133787 -0300
-@@ -143,7 +143,7 @@
-       </p>
-       <p>
-         <a>&lt;a&gt; anchor</a><br>
--        <a href="http://www.google.com">&lt;a&gt; a + href</a>
-+        <a href="https://duckduckgo.com/html">&lt;a&gt; a + href</a>
-       </p>
-       <p>
-         <abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
-diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
---- iceweasel-13.0.orig/dom/ipc/test.xul	2012-06-01 09:03:55.000000000 -0300
-+++ iceweasel-13.0/dom/ipc/test.xul		2012-06-05 20:40:59.453890004 -0300
-@@ -294,6 +294,6 @@
-                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
-   </toolbar>
- 
--  <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
-   <label id="messageLog" value="" crop="center"/>
- </window>
-diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.orig/mobile/android/app/mobile.js
---- iceweasel-14.0.1.orig/mobile/android/app/mobile.js	2012-07-12 14:27:37.000000000 -0300
-+++ iceweasel-14.0.1/mobile/android/app/mobile.js	2012-07-17 22:14:47.293560718 -0300
-@@ -226,13 +226,13 @@
- /* preferences for the Get Add-ons pane */
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/android/recommended/");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
--pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/");
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/software/gnuzilla/addons.html");
- 
- /* preference for the locale picker */
- pref("extensions.getLocales.get.url", "");
-diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul
---- iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul	2012-06-01 09:04:06.000000000 -0300
-+++ iceweasel-13.0/layout/ipc/test-ipcbrowser.xul	2012-06-05 20:44:00.714006926 -0300
-@@ -69,6 +69,6 @@
-        label="setViewportScale"/>
-   </toolbar>
- 
--  <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
-            remote="true"/>
- </window>
-diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile/xul/app/mobile.js
---- iceweasel-14.0.1.orig/mobile/xul/app/mobile.js	2012-06-01 09:04:14.000000000 -0300
-+++ iceweasel-14.0.1/mobile/xul/app/mobile.js		2012-06-05 20:48:20.193241600 -0300
-@@ -221,13 +221,12 @@
- /* preferences for the Get Add-ons pane */
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
--pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
- 
- /* preference for the locale picker */
- pref("extensions.getLocales.get.url", "");
-@@ -247,7 +246,7 @@
- pref("dom.disable_window_open_dialog_feature", true);
- 
- pref("keyword.enabled", true);
--pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
-+pref("keyword.URL", "");
- 
- pref("accessibility.typeaheadfind", false);
- pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-17.0/mobile/locales/en-US/chrome/region.properties
---- iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties	2012-11-20 00:46:15.000000000 -0200
-+++ iceweasel-17.0/mobile/locales/en-US/chrome/region.properties	2012-11-30 01:51:40.078652322 -0200
-@@ -3,34 +3,7 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo HTML
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
--
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=My Yahoo
--browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
--browser.contentHandlers.types.1.title=Google
--browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
--
--# Keyword URL (for location bar searches)
--keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
--
--# increment this number when anything gets changed in the list below.  This will
--# cause Firefox to re-read these prefs and inject any new handlers into the
--# profile database.  Note that "new" is defined as "has a different URL"; this
--# means that it's not possible to update the name of existing handler, so
--# don't make any spelling errors here.
--gecko.handlerService.defaultHandlersVersion=2
--
--# The default set of protocol handlers for webcal:
--gecko.handlerService.schemes.webcal.0.name=30 Boxes
--gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
--
--# The default set of protocol handlers for mailto:
--gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
--gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
--gecko.handlerService.schemes.mailto.1.name=Gmail
--gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-+browser.search.order.1=DuckDuckGo HTML
-diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/modules/libpref/src/init/all.js
---- iceweasel-14.0.orig/modules/libpref/src/init/all.js	2012-06-01 09:04:16.000000000 -0300
-+++ iceweasel-14.0/modules/libpref/src/init/all.js	2012-06-05 20:55:41.569045759 -0300
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
- //  The first character after a period must be alphabetic.
++pref("social.activation.whitelist", "");
+ pref("social.sidebar.open", true);
+ pref("social.sidebar.unload_timeout_ms", 10000);
+ pref("social.active", false);
+diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2013-01-04 18:44:27.000000000 -0500
++++ mozilla-release/browser/base/content/abouthome/aboutHome.css	2013-01-10 18:23:55.000000000 -0500
+@@ -66,8 +66,8 @@
+ #searchEngineLogo {
+   display: inline-block;
+   height: 28px;
+-  width: 70px;
+-  min-width: 70px;
++  width: 47px;
++  min-width: 47px;
+ }
  
--pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in
---- iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in	2012-06-01 09:03:48.000000000 -0300
-+++ iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in		2012-06-15 22:54:08.446274144 -0300
-@@ -11,13 +11,20 @@
-     <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
- <DD>@bookmarks_toolbarfolder_description@
-     <DL><p>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
-+        <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D" ID="rdf:#$GvPhC3">Parabola GNU/Linux-libre</A>
-     </DL><p>
--    <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
-+    <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3>
-     <DL><p>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
-+        <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre</A>
-+        <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Packages</A>
-+        <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Wiki</A>
-+        <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Labs</A>
-+    </DL><p>
-+    <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3>
-+    <DL><p>
-+        <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
-+        <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A>
-+        <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A>
-+        <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A>
-     </DL><p>
- </DL><p>
-diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js
---- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js	2012-11-29 02:43:23.000000000 -0200
-+++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js	2012-12-04 02:08:18.095477555 -0200
-@@ -5,99 +5,42 @@
+ #searchText {
+diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2013-01-04 18:44:27.000000000 -0500
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-01-10 18:26:10.000000000 -0500
+@@ -5,70 +5,41 @@
  // If a definition requires additional params, check that the final search url
  // is handled correctly by the engine.
  const SEARCH_ENGINES = {
@@ -529,39 +96,10 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
 -           "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" +
 -           "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" +
 -           "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC"
+-#ifdef XP_MACOSX
+-  , imageHD: "data:image/png;base64,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"
+-#endif
 -  , params: "source=hp&channel=np"
--  }
--
--, "Яндекс":
--  {
--    image: "data:image/png;base64," +
--           "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
--           "bWFnZVJlYWR5ccllPAAABWFJREFUeNrsWWtsVEUUnltLH7tbaeuDbfCBojUoBTGmooLE+Igx+gON" +
--           "RvEJhEQNUdEYA0Ji4xNf2Bg1iBJJrGBC+CEBNYoxxmh94CMKRE2MitBqoZRi6bbdZT3TfhM/TmZ2" +
--           "u5jGsOEkX8/0ztzp3HPP4zu3UTabNUfEI9YwgzAxjUbBGkG7IAv0CwYE53rWC+KChFloRh329igN" +
--           "zD8keJR+P2DvEbgnrjp4eWT65GerSZuU6FWii9Fj5pGHvC6ow/WpdP1C7SV3Bm18eNpDG2a0oA0P" +
--           "v0qFSn3IMPOKxChsmBJ1/TpBEuNn1NxRB8XOoJSYRabfrCiG0FGiDXMZ9HeC73PfGpkOST0vmYGi" +
--           "LEraMCdB/5jP46xhnhaj7C3Sal2qjFSDcU8eb4m2m4xpHvKWYwSTBd2Cr1HBrIwVnCXYIdiiNrDh" +
--           "Wi8YQLVzZ+mDt/ar9acK5gqOE6wTvKvmE4JzsN83ghSu1+AMMcGngr/pnnHYM4nzrRX8EapKm5Fc" +
--           "3/bwlAn/Jt/EtJdNmdvidjxcpyrjT+D6Fx7LPoA5jf3ktU5metY9rtZcRHNn0vV3cO0rtf6GwN9v" +
--           "DCXfX6AbVLL1hJJOxIM6UtwnJG7ORuIaMl5W7W297g2MmwR3YLxQcDmty3jOdongCrrXyRTBaoyf" +
--           "x5qdgjZ4qzfHbCQ3mzXcChcYH8hhIGf0zwQ3Ch6k8/Ae9yEM3hc8LFguWIm5uwIvwYXhPdA2RNbT" +
--           "/BLoFsECwXsw1gUIZa9h7NvZivGLgkk010eHjv5jbitXD1HiWVMhuB7jDXR9E/R0Qa3nPvvmTxZc" +
--           "7fGWyQhNK6/R9b8Ev4aSr0HyunWQ3Q/li8/hdh8JTiOD+DpPa7jegHtriUN35zDMRMEJGH9J17dB" +
--           "18KzO9V9NvndjbH1sB9objp0u+CT4VYlJ5txKLvpDMFsIJ/EwYOs9bsEp+RYeyz0nx7y6ORsGu8K" +
--           "EM2kx1ts7rkXL+YxNd8I/TOcoCDDOB5jY/Fj/P4cEmVTjr0SlKNCOcjJ8fQgodAcQ/d/i/BLK8Oo" +
--           "ZtYcLVgGD1wq2K7mx0LvKITHaFlCbny/oI4M43uQDJJkL3KH5RWnB/auh96ax9AGnKQdoZNAyO4T" +
--           "VHv4VobC+XzPntWUMgpivtwzufbgWbVpSHYh4V0DnrA6YETrCWdgvGUYIboX9KEahqlFcq0GT2HZ" +
--           "jwrXBW4zJ/C8FYdqmEWUb94aZniUUbXJVbmm0N6/5zjbPnohcfKePiDlSfBJeO0r9Bx8pi7oEw/F" +
--           "MPMp8S0roARHar+QYS6FXp9nv230dicVcA7LaZoxHo/ncfIbEdi6Qgxje4vFRL5aRqA/uxn6Vc9c" +
--           "muK/lXqeuQXsPwZMdi0RPedxH1AFva0QwyygavDkCBjlFuy/HJWhksLQgOVyxWqh3mYx7RND2Pi8" +
--           "0n1+baawmU9e2o6x/XR7raIQVb4mskGQQaO4ydNENlATeTE1kXOQc/agXDpZqhq42dQL2US9G1Wl" +
--           "G5XEzaWJbyTBddzcTuSmAYTMOKybQWsmeppIbk5nqcbxJ1RHO37B10TeRL3KU543kUKF0J8leqgq" +
--           "8ae8PdAd6ltPL954LXQV/m4HEbgaYqjT6KNZHWhAKd5+mzpDN4WflUdw5koweitv4lldX2QpxQSc" +
--           "/UOfx9jvvTHBKP+/RmKRoHwIiYg8pgQJsszTKFYSV2qC0VcShyqnqlEKRpolqsAyFfnpKmLOnOgr" +
--           "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
--           "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
--  }
 +           "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
 +           "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
 +           "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
@@ -595,99 +133,74 @@ diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js icew
 +           "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
 +           "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
 +           "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
-+  }
+   }
  };
  
- // The process of adding a new default snippet involves:
-@@ -106,13 +49,15 @@
+@@ -78,7 +49,7 @@
  //   * add an entry here in the proper ordering (based on spans)
  // The <a/> part of the snippet will be linked to the corresponding url.
  const DEFAULT_SNIPPETS_URLS = [
 -  "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
--, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
 +  "http://packages.debian.org/experimental/iceweasel"
-+, "https://www.gnu.org/software/gnuzilla/addons.html"
+ , "https://www.gnu.org/software/gnuzilla/addons.html"
  ];
  
- const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
- 
--let gSearchEngine;
-+// Bug with dom.storage.enabled set as false
-+// We are using DDG HTML as a default in this case.
-+let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?q=_searchTerms_"};
+diff -ruN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-04 18:44:28.000000000 -0500
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-01-10 18:18:10.000000000 -0500
+@@ -21,7 +21,7 @@
+ # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
+ # to be searched and the user's search query. Place them in the appropriate location
+ # for your locale's URL but do not translate them.
+-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
  
- document.addEventListener("DOMContentLoaded", function init() {
-   setupSearchEngine();
-@@ -142,13 +87,13 @@
+ # increment this number when anything gets changed in the list below.  This will
+ # cause Firefox to re-read these prefs and inject any new handlers into the 
+@@ -30,20 +30,10 @@
+ # don't make any spelling errors here.
+ gecko.handlerService.defaultHandlersVersion=3
  
- function setupSearchEngine()
- {
--  gSearchEngine = JSON.parse(localStorage["search-engine"]);
+-# The default set of protocol handlers for webcal:
+-gecko.handlerService.schemes.webcal.0.name=30 Boxes
+-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
 -
--  if (!gSearchEngine)
--    return;
-+  if (localStorage && localStorage["search-engine"]) {
-+        gSearchEngine = JSON.parse(localStorage["search-engine"]);
-+  }
- 
-+  
-   // Look for extended information, like logo and links.
--  let searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name];
-+  var searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name];
-   if (searchEngineInfo) {
-     for (let prop in searchEngineInfo)
-       gSearchEngine[prop] = searchEngineInfo[prop];
-diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties iceweasel-17.0.1/debian/branding/locales/browserconfig.properties
---- iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties	2012-12-01 07:21:01.000000000 -0200
-+++ iceweasel-17.0.1/debian/branding/locales/browserconfig.properties	2012-12-04 16:47:47.039271071 -0200
-@@ -1,3 +1,27 @@
- # Do NOT localize or otherwise change these values
-+
-+# Default startup homepage
- browser.startup.homepage=about:home
- 
-+# Default search engine
-+browser.search.defaultenginename=DuckDuckGo HTML
-+
-+# Search engine order (order displayed in the search bar dropdown)s
-+browser.search.order.1=DuckDuckGo HTML
-+browser.search.order.2=DuckDuckGo Lite
-+browser.search.order.3=Seeks Search
-+
-+# increment this number when anything gets changed in the list below.  This will
-+# cause Firefox to re-read these prefs and inject any new handlers into the 
-+# profile database.  Note that "new" is defined as "has a different URL"; this
-+# means that it's not possible to update the name of existing handler, so 
-+# don't make any spelling errors here.
-+gecko.handlerService.defaultHandlersVersion=3
-+
-+# The default set of protocol handlers for irc:
+-# The default set of protocol handlers for mailto:
+-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
+-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
+-gecko.handlerService.schemes.mailto.1.name=Gmail
+-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
+-
+ # The default set of protocol handlers for irc:
+-gecko.handlerService.schemes.irc.0.name=Mibbit
+-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
 +gecko.handlerService.schemes.irc.0.name=Freenode
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/
-+
-+# The default set of protocol handlers for ircs:
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+ 
+ # The default set of protocol handlers for ircs:
+-gecko.handlerService.schemes.ircs.0.name=Mibbit
+-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
 +gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
-diff -urN iceweasel-17.0.1.orig/debian/branding/firefox-branding.js iceweasel-17.0.1/debian/branding/firefox-branding.js
---- iceweasel-17.0.1.orig/debian/branding/firefox-branding.js	2012-12-01 07:21:01.000000000 -0200
-+++ iceweasel-17.0.1/debian/branding/firefox-branding.js	2012-12-04 16:22:08.817372515 -0200
-@@ -1,3 +1,7 @@
- pref("startup.homepage_override_url","");
- pref("startup.homepage_welcome_url","");
- pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/");
-+
-+// Disable localstorage for privacy reasons. We will rewrite about:home js to
-+// fix the bug.
-+pref("dom.storage.enabled", false);
-diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css
---- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css	2012-11-29 02:43:23.000000000 -0200
-+++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css	2012-12-04 06:31:10.410410656 -0200
-@@ -66,7 +66,7 @@
- #searchEngineLogo {
-   display: inline-block;
-   height: 28px;
--  width: 70px;
-+  width: 47px;
- }
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul
+--- mozilla-release.orig/dom/ipc/test.xul	2013-01-04 18:44:31.000000000 -0500
++++ mozilla-release/dom/ipc/test.xul	2013-01-10 18:19:26.000000000 -0500
+@@ -299,6 +299,6 @@
+                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
+   </toolbar>
  
- #searchText {
+-  <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
++  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
+   <label id="messageLog" value="" crop="center"/>
+ </window>
+diff -ruN mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/layout/ipc/test-ipcbrowser.xul
+--- mozilla-release.orig/layout/ipc/test-ipcbrowser.xul	2013-01-04 18:44:37.000000000 -0500
++++ mozilla-release/layout/ipc/test-ipcbrowser.xul	2013-01-10 18:20:03.000000000 -0500
+@@ -73,6 +73,6 @@
+        label="setViewportScale"/>
+   </toolbar>
+ 
+-  <browser type="content" src="http://www.google.com/" flex="1" id="content"
++  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
+            remote="true"/>
+ </window>
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index 619398aae..121d31aea 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -1,7 +1,7 @@
 . $topsrcdir/browser/config/mozconfig
 
 # System libraries
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo
 ac_add_options --enable-system-ffi
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-pixman
@@ -18,30 +18,16 @@ ac_add_options --with-system-zlib
 
 # Features
 ac_add_options --disable-crashreporter
-ac_add_options --disable-gnomevfs
 ac_add_options --disable-installer
-ac_add_options --disable-mochitest
 ac_add_options --disable-safe-browsing
 ac_add_options --disable-tests
 ac_add_options --disable-updater
-ac_add_options --enable-gio
+#ac_add_options --enable-gstreamer
 ac_add_options --enable-startup-notification
 
 # Vendor settings
-# Optimization
-ac_add_options --enable-optimize
 ac_add_options --libdir=/usr/lib
 ac_add_options --prefix=/usr
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-# Platform settings
-#ac_add_options --build=i586-pc-linux-gnu
-#ac_add_options --host=i586-pc-linux-gnu
-#export USE_SHORT_LIBNAME=1
-#mk_add_options USE_SHORT_LIBNAME=1
 
 # Application settings
 ac_add_options --disable-official-branding
diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt
new file mode 100644
index 000000000..fc13e32fb
--- /dev/null
+++ b/libre/iceweasel-libre/replace-urls.txt
@@ -0,0 +1,25 @@
+# These are replaced in order, so if one is a subset of another, the smaller one should be last
+# These are whitespace-separated EREs, comments are lines starting with '#'
+
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)?   https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://gnuzilla.gnu.org/plugins/
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html#themes
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://www.gnu.org/software/gnuzilla/addons.html"
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://www.gnu.org/software/gnuzilla/addons.html
+
+https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
+
+https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/
+
+https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             https://gnuzilla.gnu.org/plugins/PluginFinderService.php
+#https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
+#https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
+
+"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html"
+
+# hack: these aren't URLs, per se
+(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index d8d606bc1..c09c3c716 100644
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel-libre/vendor.js
@@ -7,3 +7,20 @@ pref("browser.shell.checkDefaultBrowser", false);
 // Don't disable our bundled extensions in the application directory
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
+
+// Default search engine
+pref("browser.search.defaultenginename", "DuckDuckGo HTML");
+
+// Search engine order (order displayed in the search bar dropdown)
+pref("browser.search.order.1", "DuckDuckGo HTML");
+pref("browser.search.order.2", "DuckDuckGo Lite");
+pref("browser.search.order.3", "Seeks Search");
+
+// Make sure that safebrowsing is disabled
+pref("browser.safebrowsing.enabled", false);
+pref("browser.safebrowsing.malware.enabled", false);
+
+pref("keyword.URL", "");
+pref("app.update.enabled", false);
+pref("app.update.auto", false);
+pref("dom.storage.enabled", false);
diff --git a/libre/iceweasel-libre/xulrunner-copy-stub.patch b/libre/iceweasel-libre/xulrunner-copy-stub.patch
deleted file mode 100644
index e3b8e9376..000000000
--- a/libre/iceweasel-libre/xulrunner-copy-stub.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iceweasel-9.0.1/browser/app/Makefile.in~	2011-12-25 16:19:29.000000000 -0500
-+++ iceweasel-9.0.1/browser/app/Makefile.in	2011-12-25 16:19:55.000000000 -0500
-@@ -257,7 +257,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
--	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/iceweasel$(BIN_SUFFIX)
- endif
- endif
-
author	Luke Shumaker <LukeShu@sbcglobal.net>	2013-01-12 17:56:54 -0500
committer	Luke Shumaker <LukeShu@sbcglobal.net>	2013-01-12 17:56:54 -0500
commit	005cec01792d1fc62eb011ea35acad0f6d9cb70e (patch)
tree	8c9c61b3c0dcdead7fd681ddaac41523162855cb /libre/iceweasel-libre
parent	f996597c6b79f714ec28ef04bd3fbd4d18bf2046 (diff)