From 074188b67513e64dc9f4f9c86331d47c13e075ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Fri, 12 Apr 2013 00:06:22 -0300
Subject: iceweasel-libre-20.0.1.1-1: new PKGBUILD under testing

---
 ...Make-the-Reset-Firefox-feature-more-gener.patch | 281 ++++++++++++
 libre-testing/iceweasel-libre/PKGBUILD             | 496 +++++++--------------
 .../iceweasel-libre/iceweasel-install-dir.patch    |  12 +-
 libre-testing/iceweasel-libre/iceweasel.desktop    | 173 ++++---
 libre-testing/iceweasel-libre/iceweasel.install    |  13 +
 libre-testing/iceweasel-libre/libre.patch          |  34 +-
 libre-testing/iceweasel-libre/mozconfig            |  50 +--
 libre-testing/iceweasel-libre/mozconfig.pgo        |   1 +
 8 files changed, 571 insertions(+), 489 deletions(-)
 create mode 100644 libre-testing/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
 create mode 100644 libre-testing/iceweasel-libre/iceweasel.install

(limited to 'libre-testing')

diff --git a/libre-testing/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre-testing/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
new file mode 100644
index 000000000..4ca4fc704
--- /dev/null
+++ b/libre-testing/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -0,0 +1,281 @@
+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 52722e9..0448444 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}");
+ 
+ this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
+diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
+index 401623a..4ce7a3e 100644
+--- a/browser/components/migration/src/MigrationUtils.jsm
++++ b/browser/components/migration/src/MigrationUtils.jsm
+@@ -404,11 +404,6 @@ this.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(
+@@ -623,6 +618,17 @@ this.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 f67823b..36016b8 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 fa45115..1fcf3cd 100644
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -42,7 +42,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 7665de2..4588f4a 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3699,7 +3699,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-testing/iceweasel-libre/PKGBUILD b/libre-testing/iceweasel-libre/PKGBUILD
index 2998ebae9..c4378bede 100644
--- a/libre-testing/iceweasel-libre/PKGBUILD
+++ b/libre-testing/iceweasel-libre/PKGBUILD
@@ -1,146 +1,90 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
 # Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
-
-# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
-
-# Maintainer (Arch) : Ionut Biru <ibiru@archlinux.org>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
-
-# Contributor: Figue <ffigue at gmail>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
-
-lowercase() { tr A-Z a-z <<<"$*"; }
+# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
-# Version Configuration ##############################################
-
-_pgo=false
+_pgo=true
 
+# We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=18.0
+_debver=20.0.1
 _debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main
+_debrepo=http://ftp.debian.org/debian/pool/main/
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+
+_pkgname=iceweasel
+pkgname=iceweasel-libre
+pkgver=$_debver.$_debrel
+pkgrel=1
+
+pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
+arch=(i686 x86_64 mips64el)
+license=(MPL GPL LGPL)
+depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification)
+makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip)
+[ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
+if $_pgo; then
+  makedepends+=(xorg-server-xvfb)
+  options=(!ccache)
+fi
 
-# locales can be easily generated by running
-# $ sed -rn 's/.*-l10n-([^.]*)\..*/\1/p' src/*.dsc | sort -u
-_locales=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
+optdepends=('networkmanager: Location detection via available WiFi networks')
+url="http://packages.debian.org/experimental/${_pkgname}"
+install=iceweasel.install
+replaces=('firefox')
+conflicts=('firefox')
+provides=('firefox')
+source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
+        "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz"
+        mozconfig
+        mozconfig.pgo
+        libre.patch
+        iceweasel.desktop
+        iceweasel-install-dir.patch
+        vendor.js
+        shared-libs.patch
+        replace-urls.txt
+        Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
+md5sums=('22daa24b6490c654f131550cbf20fad3'
+         '0c70ab52f35701558081df3d360361a2'
+         'f90c6a70d0a6d0a9e7f9a0eed6aeffd3'
+         '383e8e2a97a8b13fe56d153adb6878b6'
+         '5addd418bf32b673fdfe80c8fefbea1a'
+         '7b9e5996dd9fe0b186a43a297db1c6b5'
+         'abf5ecb74caa857abb42bcfbb3442d9c'
+         '6dd547c72bb875a3101135a1c32d4783'
+         '52e52f840a49eb1d14be1c0065b03a93'
+         'a8fc4658d45b6bf9350023e5c3f34e56'
+         'd0e1f2625cd9f7234abdeb55aee00529')
 
-pkgbase=iceweasel
-pkgname=(iceweasel-libre)
-for locale in "${_locales[@]}"; do
-	pkgname+=("iceweasel-libre-l10n-$(lowercase ${locale})")
-done
-pkgver=${_debver}.${_debrel}
-pkgrel=3
+prepare() {
+  export DEBIAN_BUILD="mozilla-release"
 
-######################################################################
+  export QUILT_PATCHES=debian/patches
+  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
+  export QUILT_DIFF_ARGS='--no-timestamps'
 
-debfile() { echo "${_debrepo}/${1:0:1}/${1%_*}/${1}"; }
+  mv debian "$srcdir/$DEBIAN_BUILD"
+  cd "$srcdir/$DEBIAN_BUILD"
 
-if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
-if $_pgo; then pkgname+='-pgo'; fi
-if [ "$pkgbase" != "$pkgname" ]; then
-  provides+=("$pkgbase=$pkgver")
-  conflicts+=("$pkgbase")
-fi
+  # Doesn't apply and seems unimportant
+  rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
 
-pkgdesc="A libre version of Debian Iceweasel, the web browser based on Mozilla Firefox."
-arch=(
-  'i686'
-  'mips64el'
-  'x86_64'
-)
-license=(
-  'GPL2'
-  'LGPL'
-  'MPL'
-)
-depends=(
-  'alsa-lib'
-  'dbus-glib'
-  'desktop-file-utils'
-  'gtk2'
-  'hicolor-icon-theme'
-  'hunspell'
-  'libevent'
-  'libnotify'
-  'libvpx'
-  'libxt'
-  'mime-types'
-  'mozilla-common'
-  'mozilla-searchplugins'
-  'nss>=3.14.1'
-  'sqlite'
-  'startup-notification'
-)
-makedepends=(
-  'autoconf2.13'
-  'diffutils'
-  'dpkg-devtools'
-  'imagemagick'
-  'imake'
-  'libidl2'
-  'librsvg'
-  'libxslt'
-  'mesa'
-  'python2'
-  'unzip'
-  'zip'
-)
-[[ $CARCH != mips64el ]] && makedepends+=('yasm')
-if $_pgo; then
-  makedepends+=('xorg-server-xvfb')
-  options+=(!ccache)
-fi
-optdepends=('networkmanager: Location detection via available WiFi networks')
-url="http://packages.debian.org/source/experimental/$_debname"
-install=firefox.install
-options=(!emptydirs)
-source=($(debfile ${_debname}_${_debver}-${_debrel}.dsc)
-        $(debfile ${_debname}_${_debver}-${_debrel}.debian.tar.gz)
-        $(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)
-        replace-urls.txt libre.patch mozconfig.pgo
-        mozconfig $pkgbase.desktop iceweasel-install-dir.patch vendor.js shared-libs.patch
-        bug677092.patch)
-# use dpkg-source to extract everything
-noextract=(); for file in "${source[@]}"; do noextract+=("${file##*/}"); done
-
-# This is a bug, we should fix it.
-mips64el-prepare() {
-  # Fix MIPS N32 support.
-  sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
-    js/src/assembler/wtf/Platform.h
-  # Disable JIT.
-  sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-    js/src/assembler/wtf/Platform.h
-  sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in
-}
-misp64el-configure() {
-  echo 'ac_add_options --disable-methodjit' >> .mozconfig
-  echo 'ac_add_options --disable-tracejit' >> .mozconfig
-  echo 'ac_add_options --disable-jemalloc' >> .mozconfig
-}
-
-prepare() {
-  if [[ -d "/usr/lib/$pkgbase" ]]; then
-    error "Because of how rpath is set, this package cannot be installed during build"
-    return 1
-  fi
-  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc mozilla-release
-  cd mozilla-release
+  # This patch doesn't works in some parts due that has patches for others locales languages, source code hasn't it
+  rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
 
-  patch -Np1 -i ../iceweasel-install-dir.patch
-  patch -Np1 -i ../shared-libs.patch
+  quilt push -a
 
-  # Back out https://bugzilla.mozilla.org/show_bug.cgi?id=677092
-  # in order to fix https://bugzilla.mozilla.org/show_bug.cgi?id=818468
-  patch -Rp1 -i ../bug677092.patch
+  patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+  patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
+  patch -Np1 -i "$srcdir/shared-libs.patch"
 
   # Replace common URLs
   sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
@@ -153,258 +97,118 @@ prepare() {
     fi
   done
 
-  # Liberate the locales
-  printf '%s\n' l10n-*/*/searchplugins/*.xml \
-    | grep -Ev 'creativecommons|wikipedia|wikipediaro|wiktionary' \
-    | xargs -d '\n' rm -f
-  for dir in l10n-*/*/searchplugins; do
-    pushd "$dir"
-    ls | sed -n 's/\.xml$//p' > list.txt
-    popd
-  done
-  find l10n-* -name 'region.properties' -delete
-
   # Patch anything that's left
-  patch -Np1 -i ../libre.patch
+  patch -Np1 -i "$srcdir/libre.patch"
+
+  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+
+  if $_pgo; then
+    cat "$srcdir/mozconfig.pgo" >> .mozconfig
+  fi
+
+  # From js on abslibre-mips64el.git
+  if [ "$CARCH" = "mips64el" ]; then
+      msg "Force disabling JIT."
+      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
+          js/src/assembler/wtf/Platform.h
+      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref}
+
+      echo "ac_add_options --disable-methodjit" >> .mozconfig
+      echo "ac_add_options --disable-tracejit" >> .mozconfig
+  fi
+
+  # This is a bug, we should fix it
+  if [ "$CARCH" = "mips64el" ]; then
+      # Fix MIPS N32 support.
+      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
+          js/src/assembler/wtf/Platform.h
+      # Disable JIT.
+      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
+          js/src/assembler/wtf/Platform.h
+      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in
+      echo 'ac_add_options --disable-methodjit' >> .mozconfig
+      echo 'ac_add_options --disable-tracejit' >> .mozconfig
+      echo 'ac_add_options --disable-jemalloc' >> .mozconfig
+  fi
 
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
     browser/base/Makefile.in
 
-  if [[ $CARCH  == mips64el ]]; then mips64el-prepare; fi
-
-  touch "$srcdir/.makepkg-prepare"
-}
+  mkdir "$srcdir/path"
 
-build() {
-  [[ -f "$srcdir/.makepkg-prepare" ]] || { prepare || return $?; cd "$srcdir"; }
-  cd "$srcdir"
-  build_browser
-  for locale in "${_locales[@]}"; do
-    cd "$srcdir"
-    build_locale "${locale}"
-  done
-}
+  # WebRTC build tries to execute "python" and expects Python 2
+  ln -s /usr/bin/python2 "$srcdir/path/python"
 
-build_browser() {
-  cd mozilla-release
+  # Use gold, as Mozilla can use some of its features, such as safe ICF
+  ln -s /usr/bin/ld.gold "$srcdir/path/ld"
 
-  cp ../mozconfig .mozconfig
-  if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi
-  if [[ $CARCH  == mips64el ]]; then mips64el-configure; fi
+  # configure script misdetects the preprocessor without an optimization level
+  # https://bugs.archlinux.org/task/34644
+  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+}
 
-  # 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"
+build() {
+  cd "$srcdir/$DEBIAN_BUILD"
 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
+  export PATH="$srcdir/path:$PATH"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
   export PYTHON="/usr/bin/python2"
   export MOZ_MAKE_FLAGS="$MAKEFLAGS"
   unset MAKEFLAGS
 
-  if $_pgo; then
-    export MOZ_PGO=1
-    export DISPLAY=:99
-    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-  fi
-
-  _fail=0
-  make -f client.mk build || _fail=1
+  # Enable PGO for x86_64 and mips64el only. i686 currently has problems:
+  # Either segfaults since gcc 4.8, or the linker runs out of memory
+  # If you discover that PGO again works on i686, please file a bug
 
   if $_pgo; then
-    kill $! || true
-  fi
-  return $_fail
-}
-
-build_locale() {
-  locale=$1
-  cd mozilla-release
-
-  export PYTHON="/usr/bin/python2"
-  export PRODUCT='browser'
-
-  # This is an adaptation of the "$(L10N_BUILD_STAMPS)" rule from debian/rules
-  [[ -e l10n ]] || mkdir -p l10n
-  [[ -e l10n/$locale ]] || ln -sf ../l10n-$locale l10n/$locale
-  ${PYTHON} config/pythonpath.py -I$(pwd)/compare-locales/lib \
-    $(pwd)/compare-locales/scripts/compare-locales \
-    -m $(pwd)/moz-objdir/l10n-$locale ${PRODUCT}/locales/l10n.ini $(pwd)/l10n $locale
-  make -C moz-objdir/${PRODUCT}/locales langpack-$locale \
-    L10NBASEDIR=$(pwd)/l10n MOZ_CHROME_FILE_FORMAT=flat \
-    MOZ_LANGPACK_EID=langpack-${locale}@${pkgbase}.mozilla.org \
-    PKG_LANGPACK_BASENAME='$(MOZ_LANGPACK_EID)' PKG_LANGPACK_PATH=xpi/ \
-    LOCALE_MERGEDIR=$(pwd)/moz-objdir/l10n-$locale
-}
 
-install-icon() {
-  local brandingdir=$1 prog=$2 size=$3
-  local sizedir=${size}x${size} ext=png
-  [[ $size == scalable ]] && { sizedir=$size; ext=svg; size=''; }
+      if [[ $CARCH != i686 ]]; then
+        export DISPLAY=:99
+        Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+        _fail=0
 
-  dirs=({moz-objdir/,}"$brandingdir")
-  files=({default,mozicon,${prog}{,_icon}}${size}.${ext})
+        make -j1 -f client.mk build MOZ_PGO=1 || _fail=1
 
-  for dir in "${dirs[@]}"; do
-    for files in "${files[@]}"; do
-      if [[ -e "$dir/$file" ]]; then
-	install -Dm644 "$dir/$file" \
-	  "$pkgdir/usr/share/icons/hicolor/$sizedir/apps/$prog.png"
-	return 0
+        kill $! || true
+        return $_fail
+      else
+        make -j1 -f client.mk build
       fi
-    done
-  done
-  #return 1
+
+  else
+    make -j1 -f client.mk build
+  fi
 }
 
-package_iceweasel-libre() {
-  cd mozilla-release
+package() {
+  cd "$srcdir/$DEBIAN_BUILD"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js"
 
-  for size in 16 32 48 64 128 scalable; do
-    install-icon debian/branding $pkgbase $size
+  # I don't even know why we're hitting the objdir, and ConnOS didn't
+  _brandingdir=debian/branding
+  brandingdir=moz-objdir/$_brandingdir
+  icondir="$pkgdir/usr/share/icons/hicolor"
+  for i in 16x16 32x32 48x48 64x64; do
+    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
   done
+  install -Dm644 "$brandingdir/mozicon128.png"      "$icondir/128x128/apps/$_pkgname.png"
+  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg"
 
-  install -Dm644 ../$pkgbase.desktop \
-    "$pkgdir/usr/share/applications/$pkgbase.desktop"
+  install -d                                        "$pkgdir/usr/share/applications"
+  install -m644  "$srcdir/iceweasel.desktop"        "$pkgdir/usr/share/applications"
 
-  # Use system-provided dictionaries
-  rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries"
-  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation"
-  # use mozilla-searchplugins
-  rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins
-  ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
+  rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
+  ln -sf /usr/share/hunspell            "$pkgdir/usr/lib/$_pkgname/dictionaries"
+  ln -sf /usr/share/hyphen              "$pkgdir/usr/lib/$_pkgname/hyphenation"
+  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$_pkgname/plugins"
+  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins"
 
   # We don't want the development stuff
-  rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl}
+  rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
 
-  #workaround for now
-  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin"
+  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
 }
-
-package_locale() {
-  locale=$1
-  cd mozilla-release
-  lang=$(sed -n "/^%define L10N_LANG ${locale}/,+1p" debian/l10n/browser-l10n.control|sed -n 's/%define L10N_LANGUAGE\s\s*//p')
-
-  pkgdesc="${lang} language package for Iceweasel-libre"
-  depends=("iceweasel-libre=${pkgver}")
-
-  replaces=(iceweasel-i18n-$(lowercase "${locale}"))
-  conflicts=(iceweasel-i18n-$(lowercase "${locale}"))
-
-  extdir="$pkgdir"/usr/lib/iceweasel/extensions/
-  install -d "${extdir}"
-  install -m644 moz-objdir/dist/xpi/langpack-${locale}@${pkgbase}.mozilla.org.xpi "${extdir}"
-}
-for locale in "${_locales[@]}"; do
-  eval "package_iceweasel-libre-l10n-$(lowercase ${locale})() { package_locale ${locale}; }"
-done
-
-md5sums=('263569a577f72314694a711cc6a0d96f'
-         '6a571d3a3b355c331f67d57702f4fccf'
-         '366e1e4847d7e00eba77ee5a4be0d3db'
-         '80dd4a702302fb36719c67445b487895'
-         'c99d7605c0e0bb0d77e71cd54f305a9a'
-         '1f4aeabf6c28fcf6539d13f65f8b366b'
-         'cb9cc5f721d81442f1a93d134054f23c'
-         'c69e0fa169bf6c49b1f83afd2383b628'
-         '09f4376791d17a772c60a0308095211d'
-         'a16081e4da9daf6df5f6fcce2000cec1'
-         '88dd4c5837485acea83e97f3cb4f1e31'
-         '8751f0a634656ba973c53f96d1fa34e1'
-         'f4531f867e6e75501bac3d7ed5f09045'
-         '740667ba651f0562b45bbfe63b8ec84e'
-         'a1f3637341457fb8272d126f1aa70e4b'
-         '3d00ad2734c890930441d6cd919f11c8'
-         '84b7a2bf7f1458b60e9552d04c7e84b2'
-         '30ce51ca764b091c59df5c08e35e8a7f'
-         '1291e5976c83a8cda1903e4443d44c8e'
-         '1eacf81985d9993b2b94f98fd4c453e0'
-         '07b91907c98155c1b95e5d7f47367fde'
-         'cd4042405f6eaa2931021f745f49d91f'
-         '24f8a5d05d0d2485c30b46e6d6835330'
-         '1b95f32637229a86e4633994350cf76f'
-         'ae6007384d85dbd14fbe6496e0b9e47b'
-         'a8ef67c04d3dc263f0f58e877b13cd71'
-         'b5c3b2e366aa776e574d0972df72a423'
-         '200f856b50a7485a1d5447cbf8dee77c'
-         '1767400f27cf010572308f949e56176e'
-         'c6dde21438789ccf4c666afc22ee713c'
-         'd202408658b9e7e7a2656dd874ac0712'
-         '1c463a18e2a395314f7d0ad72282d5aa'
-         'ec222722f432e8a94f993c1c32cd9757'
-         'cf44fd1d567a7638fc0b5b80bb0398f7'
-         '13151197d7ef349699e55c760c74af16'
-         '32c185ef506e439bb63f572906a9bf66'
-         '2e6b90b3c6cad17753ec1aecaf61073c'
-         'dbf451ef9ecf1816973ac4dffe7e2b8e'
-         '85c0900fb798fb64a8883dba06deccc0'
-         '0efff47ab838fd320c710ffd46ee3a57'
-         '28e5d445e7a91ddd64d50478b05edb51'
-         '770dcdf1a8d6d2db64dadb6e4f6149fb'
-         '7732b021cdf73ace33cb41609b327f3d'
-         '3a195266b43e9f477619aac9c326a26b'
-         'a55e22c7ab045826b331efd7c0f036ef'
-         '2edcd565c19828e3d4a2da19f8529edd'
-         '531c54a91d509e768b55bfd88a96a527'
-         'ddf2182b6e33795450bf41f46e7be521'
-         '8bf4edabc95abbaf274ddd5e5c5db562'
-         '63a227dbab0e66b6a0d4804c419049e2'
-         '3c9bab1f629c0b079345a186c0f22afc'
-         '786a62179094cda5f5e831232f4f94ce'
-         '535f68d0cfa4dee9df0cddbee42a4c94'
-         'ffc4c457dfa697162e4198e61ae19e3b'
-         '4476b94e676b3cfb309f972f7c42da1b'
-         '792700b40ba53de7de5b48187b604b29'
-         '7f71fa7bed8488226168406ac022d2fd'
-         'fdd9a144cd2a630d1b7ab6b73315c548'
-         '88d668eccb111a9e4f5fde58e000a5aa'
-         '46509bb591bf54b6fed025814bfc11bf'
-         '715a3f8c2fcdab17b24ce61f55c49183'
-         '658226211d66a724d0335a173ef8512f'
-         'ecb41c7536c95cf2ca118d7ab6b7d357'
-         'b813931cfba36f3b00826ba2d36e648f'
-         '2a926d37294ab24a7d7dc879339ae736'
-         'fba979124cd393f1164a59e3b9183ccc'
-         'e8597a5af1643b9c9a0b02a3756e0a86'
-         '665140babab027228eb195b6c0e83d4e'
-         'e71a740bfc52d25968f8e2c4c1896897'
-         '47bd00559728578bfc257b80c72ce393'
-         '3a3d846613363e6d4dd99326cd07417d'
-         '80daf692c2fa80ef7f528df2a6aed42e'
-         '25c03afb8f5086a07eb0e26c94bcbc01'
-         '481db49b914f33d6c594ecebbc291e4c'
-         '742d2af843536fc1cdc8560b5aa0620f'
-         '9ee935f09dc89b42db9ad8db3473717d'
-         'cf3e65e4db50dfa467defb4f820cd378'
-         '3e0c8ea5b69c4363e40c21dda5230850'
-         '32b73226e95ae47dc11a554a7208d960'
-         '437602c23394eb02ae5fe03ca4fd29bc'
-         'f7a347a3d5679d82340d227474de938f'
-         '1a898825183ed67ea72b67a2c3486dd4'
-         '73bead055152cd4885b9834691c9066a'
-         '722a0d2212060e2044cbac859db3e063'
-         'fba01f51ac90dec18758a7468fb509e1'
-         '03c2a59eab8ef4ad3687b91c07f96165'
-         'd502ec35e4ec26d7f538f4b96402fe9c'
-         'b75b729e9ab3ff9a908115ab520339a9'
-         'cd696e70fdb4f5ab9d50040abea46b82'
-         '1b9df937ef08b6a72ca7d659f91df099'
-         '17bbe91d26b302aa36391ed57199006d'
-         'de6037c0a65e7b86e0929637156ba587'
-         'a8fc4658d45b6bf9350023e5c3f34e56'
-         '25861e760dc41b518cbee9c9194b2b19'
-         'e4cd438a0b2a42dfb14bc7716e901e5f'
-         '5bfaf77580b6d3ce185b4c3ad4fa30ca'
-         '39d8b9249c5effe5fe24d2e9f80a9a94'
-         '2baf8cffccd50c568ad153a709cb3136'
-         'e9b4ec9a34bdab1854255aaa05e7cedd'
-         '52e52f840a49eb1d14be1c0065b03a93'
-         '23520aca140fb0dd3e1b6f21b21f591f')
diff --git a/libre-testing/iceweasel-libre/iceweasel-install-dir.patch b/libre-testing/iceweasel-libre/iceweasel-install-dir.patch
index 0524c8e5e..a44aef496 100644
--- a/libre-testing/iceweasel-libre/iceweasel-install-dir.patch
+++ b/libre-testing/iceweasel-libre/iceweasel-install-dir.patch
@@ -1,6 +1,6 @@
-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
+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
 @@ -1,10 +1,10 @@
  INCLUDED_AUTOCONF_MK = 1
  
@@ -16,9 +16,9 @@ diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/basec
  DIST = $(DEPTH)/dist
  
  # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-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
+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
 @@ -1,7 +1,7 @@
  INCLUDED_AUTOCONF_MK = 1
  
diff --git a/libre-testing/iceweasel-libre/iceweasel.desktop b/libre-testing/iceweasel-libre/iceweasel.desktop
index 740ed5b31..c4a338cc6 100644
--- a/libre-testing/iceweasel-libre/iceweasel.desktop
+++ b/libre-testing/iceweasel-libre/iceweasel.desktop
@@ -1,116 +1,105 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=Iceweasel
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
+Name[bg]=Iceweasel
+Name[ca]=Iceweasel
+Name[cs]=Iceweasel
+Name[el]=Iceweasel
+Name[es]=Iceweasel
+Name[fa]=Iceweasel
+Name[fi]=Iceweasel
+Name[fr]=Iceweasel
+Name[hu]=Iceweasel
+Name[it]=Iceweasel
+Name[ja]=Iceweasel
+Name[ko]=Iceweasel
+Name[nb]=Iceweasel
+Name[nl]=Iceweasel
+Name[nn]=Iceweasel
+Name[no]=Iceweasel
+Name[pl]=Iceweasel
+Name[pt]=Iceweasel
+Name[pt_BR]=Iceweasel
+Name[ru]=Iceweasel
+Name[sk]=Iceweasel
+Name[sv]=Iceweasel
 Comment=Browse the World Wide Web
-Comment[ar]=تصفح الشبكة العنكبوتية العالمية
-Comment[ast]=Restola pela Rede
-Comment[bn]=ইন্টারনেট ব্রাউজ করুন
-Comment[ca]=Navegueu per la web
+Comment[bg]=Сърфиране в Мрежата
+Comment[ca]=Navegueu per el web
 Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[da]=Surf på internettet
 Comment[de]=Im Internet surfen
-Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
+Comment[el]=Περιηγηθείτε στον παγκόσμιο ιστό
 Comment[es]=Navegue por la web
-Comment[et]=Lehitse veebi
 Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
 Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Naviguer sur le Web
-Comment[gl]=Navegar pola rede
-Comment[he]=גלישה ברחבי האינטרנט
-Comment[hr]=Pretražite web
+Comment[fr]=Navigue sur Internet
 Comment[hu]=A világháló böngészése
 Comment[it]=Esplora il web
 Comment[ja]=ウェブを閲覧します
 Comment[ko]=웹을 돌아 다닙니다
-Comment[ku]=Li torê bigere
-Comment[lt]=Naršykite internete
 Comment[nb]=Surf på nettet
 Comment[nl]=Verken het internet
 Comment[nn]=Surf på nettet
 Comment[no]=Surf på nettet
-Comment[pl]=Przeglądanie stron WWW
+Comment[pl]=Przeglądanie stron WWW 
 Comment[pt]=Navegue na Internet
 Comment[pt_BR]=Navegue na Internet
-Comment[ro]=Navigați pe Internet
-Comment[ru]=Доступ в Интернет
+Comment[ru]=Обозреватель Всемирной Паутины
 Comment[sk]=Prehliadanie internetu
-Comment[sl]=Brskajte po spletu
 Comment[sv]=Surfa på webben
-Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
-Comment[uk]=Перегляд сторінок Інтернету
-Comment[vi]=Để duyệt các trang web
-Comment[zh_CN]=浏览互联网
-Comment[zh_TW]=瀏覽網際網路
+GenericName=Web Browser
+GenericName[bg]=Интернет браузър
+GenericName[ca]=Navegador web
+GenericName[cs]=Webový prohlížeč
+GenericName[de]=Webbrowser
+GenericName[el]=Περιηγητής ιστού
+GenericName[es]=Navegador web
+GenericName[fa]=مرورگر اینترنتی
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブ・ブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[no]=Nettleser
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ru]=Интернет-браузер
+GenericName[sk]=Internetový prehliadač
+GenericName[sv]=Webbläsare
+X-GNOME-FullName=Iceweasel Web Browser
+X-GNOME-FullName[bg]=Интернет браузър (Iceweasel)
+X-GNOME-FullName[ca]=Navegador web Iceweasel
+X-GNOME-FullName[cs]=Iceweasel Webový prohlížeč
+X-GNOME-FullName[el]=Περιηγήτης Ιστού Iceweasel
+X-GNOME-FullName[es]=Navegador web Iceweasel
+X-GNOME-FullName[fa]=مرورگر اینترنتی Iceweasel
+X-GNOME-FullName[fi]=Iceweasel-selain
+X-GNOME-FullName[fr]=Navigateur Web Iceweasel
+X-GNOME-FullName[hu]=Iceweasel webböngésző
+X-GNOME-FullName[it]=Iceweasel Browser Web
+X-GNOME-FullName[ja]=Iceweasel ウェブ・ブラウザ
+X-GNOME-FullName[ko]=Iceweasel 웹 브라우저
+X-GNOME-FullName[nb]=Iceweasel Nettleser
+X-GNOME-FullName[nl]=Iceweasel webbrowser
+X-GNOME-FullName[nn]=Iceweasel Nettlesar
+X-GNOME-FullName[no]=Iceweasel Nettleser
+X-GNOME-FullName[pl]=Przeglądarka WWW Iceweasel
+X-GNOME-FullName[pt]=Iceweasel Navegador Web
+X-GNOME-FullName[pt_BR]=Navegador Web Iceweasel
+X-GNOME-FullName[ru]=Интернет-браузер Iceweasel
+X-GNOME-FullName[sk]=Internetový prehliadač Iceweasel
+X-GNOME-FullName[sv]=Webbläsaren Iceweasel
 Exec=/usr/lib/iceweasel/iceweasel %u
-Icon=iceweasel
 Terminal=false
+X-MultipleArgs=false
 Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
+Icon=iceweasel
 Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;
+StartupWMClass=Iceweasel
+StartupNotify=true
diff --git a/libre-testing/iceweasel-libre/iceweasel.install b/libre-testing/iceweasel-libre/iceweasel.install
new file mode 100644
index 000000000..c1fe8284a
--- /dev/null
+++ b/libre-testing/iceweasel-libre/iceweasel.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
diff --git a/libre-testing/iceweasel-libre/libre.patch b/libre-testing/iceweasel-libre/libre.patch
index f80295e55..9d2aa7c05 100644
--- a/libre-testing/iceweasel-libre/libre.patch
+++ b/libre-testing/iceweasel-libre/libre.patch
@@ -1,19 +1,20 @@
 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 @@
+--- mozilla-release.orig/browser/app/profile/firefox.js	2013-03-26 19:17:35.000000000 -0300
++++ mozilla-release/browser/app/profile/firefox.js	2013-04-03 16:10:57.681396937 -0300
+@@ -1176,12 +1176,9 @@
  // (This is intentionally on the high side; see bug 746055.)
  pref("image.mem.max_decoded_image_kb", 256000);
  
--// Example social provider
+-// Default social providers
 -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.
 -pref("social.activation.whitelist", "https://www.facebook.com");
 +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.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
@@ -156,9 +157,9 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  
  #searchText {
 diff -urN 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	2012-11-20 00:45:50.000000000 -0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-28 21:45:00.486713730 -0200
-@@ -3,25 +3,18 @@
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-02-15 19:14:45.000000000 -0200
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-02-20 19:55:41.962705914 -0200
+@@ -3,19 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  # Default search engine
@@ -180,16 +181,9 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
 +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 @@
+@@ -24,20 +17,10 @@
  # don't make any spelling errors here.
  gecko.handlerService.defaultHandlersVersion=3
  
@@ -206,14 +200,14 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
  # 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/?channels=%s
++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC
++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/?channels=%s
++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
 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
diff --git a/libre-testing/iceweasel-libre/mozconfig b/libre-testing/iceweasel-libre/mozconfig
index 121d31aea..c929b8972 100644
--- a/libre-testing/iceweasel-libre/mozconfig
+++ b/libre-testing/iceweasel-libre/mozconfig
@@ -1,39 +1,39 @@
 . $topsrcdir/browser/config/mozconfig
 
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# Iceweasel
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=debian/branding
+
 # System libraries
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-pixman
-ac_add_options --enable-system-sqlite
-ac_add_options --with-pthreads
-ac_add_options --with-system-bz2
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
-ac_add_options --with-system-png
+ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
 
 # Features
-ac_add_options --disable-crashreporter
-ac_add_options --disable-installer
-ac_add_options --disable-safe-browsing
-ac_add_options --disable-tests
-ac_add_options --disable-updater
-#ac_add_options --enable-gstreamer
 ac_add_options --enable-startup-notification
+#ac_add_options --enable-gstreamer
 
-# Vendor settings
-ac_add_options --libdir=/usr/lib
-ac_add_options --prefix=/usr
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-installer
 
-# Application settings
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=debian/branding
+# Parabola features
+ac_add_options --disable-safe-browsing
 
 # Other
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-
-# Build-generated
diff --git a/libre-testing/iceweasel-libre/mozconfig.pgo b/libre-testing/iceweasel-libre/mozconfig.pgo
index 57d11eed0..2f4ebe32b 100644
--- a/libre-testing/iceweasel-libre/mozconfig.pgo
+++ b/libre-testing/iceweasel-libre/mozconfig.pgo
@@ -1,2 +1,3 @@
+
 # PGO
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
-- 
cgit v1.2.3-2-g168b