Merge branch 'master' of git+ssh://parabola-git/abslibre

27 files changed, 696 insertions, 627 deletions

diff --git a/mozilla-testing/icecat-i18n/Makefile b/mozilla-testing/icecat-i18n/Makefile
index 5dd818e62..237edb616 100644
--- a/mozilla-testing/icecat-i18n/Makefile
+++ b/mozilla-testing/icecat-i18n/Makefile
@@ -7,25 +7,30 @@
 #  - sed
 #  - wget
 
+# Variables:
+_pkgver=9.0
 pkgver=9.0.1
+pkgrel=2
+
+# Guts: ##############################################################
 
 default: PHONY all
 all: PHONY PKGBUILD
-.PRECIOUS: PKGBUILD
 
 index.html: Makefile
 	rm -f $@
 	wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/
 langpacks.txt: index.html Makefile
 	egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@
-PKGBUILD: langpacks.txt Makefile
+PKGBUILD: PKGBUILD.in langpacks.txt Makefile
 	sed \
-	  -e 's/^pkgver=.*/pkgver=$(pkgver)/' \
-	  -e "s/_langpacks=.*/_langpacks=(`xargs echo < $<`)/" \
+	  -e 's/@_PKGVER@/$(_pkgver)/' \
+	  -e 's/@PKGVER@/$(pkgver)/' \
+	  -e 's/@PKGREL@/$(pkgrel)/' \
+	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
 	  -e '/md5sums/,$$d' \
-	  $@ > $@.$$$$ && \
-	makepkg -g >> $@.$$$$ && \
-	mv $@.$$$$ $@
+	  PKGBUILD.in > $@
+	makepkg -dg >> $@
 
 clean: PHONY
 	rm -f index.html langpacks.txt *.xpi
diff --git a/mozilla-testing/icecat-i18n/PKGBUILD b/mozilla-testing/icecat-i18n/PKGBUILD
index 117d6a6bf..62f06df8e 100644
--- a/mozilla-testing/icecat-i18n/PKGBUILD
+++ b/mozilla-testing/icecat-i18n/PKGBUILD
@@ -3,7 +3,8 @@
 # Based on firefox-i18n package
 
 # When updating to a newer upstream release:
-# - Edit pkgver= in Makefile.
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
 # - Run 'make'. It will take care of everything else for you.
 
 _langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg 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)
@@ -14,7 +15,7 @@ pkgname=($(for lang in ${_langpacks[@]}
         done))
 _pkgver=9.0
 pkgver=9.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Language packs for GNUzilla IceCat."
 arch=('any')
 license=('MPL')
diff --git a/mozilla-testing/icecat-i18n/PKGBUILD.in b/mozilla-testing/icecat-i18n/PKGBUILD.in
new file mode 100644
index 000000000..90c901e31
--- /dev/null
+++ b/mozilla-testing/icecat-i18n/PKGBUILD.in
@@ -0,0 +1,46 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: Figue <ffigue@gmail.com>
+# Based on firefox-i18n package
+
+# When updating to a newer upstream release:
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
+
+_langpacks=@LANGPACKS@
+
+pkgbase='icecat-i18n'
+pkgname=($(for lang in ${_langpacks[@]}
+        do echo icecat-i18n-$lang | tr A-Z a-z
+        done))
+_pkgver=@_PKGVER@
+pkgver=@PKGVER@
+pkgrel=@PKGREL@
+pkgdesc="Language packs for GNUzilla IceCat."
+arch=('any')
+license=('MPL')
+url="http://www.gnu.org/software/gnuzilla/"
+depends=("icecat=${pkgver}")
+source=($(for lang in ${_langpacks[@]}
+        do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi
+        done))
+noextract=($(for lang in ${_langpacks[@]}
+        do echo $lang.xpi
+        done))
+
+build() {
+  cd "${srcdir}"
+}
+
+_path="/usr/lib/icecat-$_pkgver/extensions/"
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_icecat-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi'
+}
+"
+done
+
diff --git a/mozilla-testing/icecat/PKGBUILD b/mozilla-testing/icecat/PKGBUILD
index af040596a..b2b5eadef 100644
--- a/mozilla-testing/icecat/PKGBUILD
+++ b/mozilla-testing/icecat/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Figue <ffigue at gmail>
+# 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): Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
@@ -11,12 +11,10 @@
 # the value for 'browser.dictionaries.download.url' in 'libre.patch'
 
 pkgname=icecat
-_pkgver=9.0
 pkgver=9.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnu.org/software/gnuzilla/"
 license=('MPL' 'GPL' 'LGPL')
 depends=(
   'alsa-lib'
@@ -32,7 +30,7 @@ depends=(
   'mime-types'
   'mozilla-common'
   'mozilla-searchplugins'
-  'nss'
+  'nss>=3.13.1'
   'sqlite3'
   'startup-notification'
 )
@@ -49,29 +47,28 @@ makedepends=(
   'yasm'
   'zip'
 )
-options=(!buildflags !distcc)
+url="http://www.gnu.org/software/gnuzilla/"
 install=icecat.install
 source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         mozconfig
-	mozconfig.old
-	mozconfig.default
-	libre.patch
-	parabola.patch
         icecat.desktop
-        icecat-safe.desktop)
+        icecat-safe.desktop
+        libre.patch
+        firefox-install-dir.patch
+        vendor.js)
 
 build() {
-  ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+  patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname
   patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff
-  patch -Np1 -i "$srcdir/parabola.patch" # Parabola settings
 
   # Fix PRE_RELEASE_SUFFIX
-  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' browser/base/Makefile.in
+  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
+    browser/base/Makefile.in
 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,$ICECATDIR"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
   export PYTHON="/usr/bin/python2"
 
   LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
@@ -80,43 +77,49 @@ build() {
 }
 
 package() {
-  ICECATDIR="/usr/lib/${pkgname}-${_pkgver}" && export ICECATDIR
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
+  cd "$srcdir/$pkgname-$pkgver"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
-  msg2 "Finishing..."
-  install -m755 -d                                        "${pkgdir}/usr/share/pixmaps"
-  install -m644 browser/branding/unofficial/default48.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$pkgname/defaults/pref"
 
-  install -m755 -d                              "${pkgdir}/usr/share/applications"
-  install -m644 "${srcdir}/icecat.desktop"      "${pkgdir}/usr/share/applications"
-  install -m644 "${srcdir}/icecat-safe.desktop" "${pkgdir}/usr/share/applications"
+  brandingdir="browser/branding/unofficial"
+  for i in 16x16 32x32 48x48; do
+    install -Dm644 "$brandingdir/default${i/x*/}.png" "$pkgdir/usr/share/icons/hicolor/$i/apps/$pkgname.png"
+  done
 
-  ln -s "${pkgname}-${pkgver}" "${pkgdir}/usr/lib/${pkgname}-${_pkgver}" # WHY???!!!
-  ln -s "${pkgname}-${_pkgver}" "${pkgdir}/usr/lib/${pkgname}"
+  install -d                                  "$pkgdir/usr/share/applications"
+  install -m644 "$srcdir/icecat.desktop"      "$pkgdir/usr/share/applications"
+  install -m644 "$srcdir/icecat-safe.desktop" "$pkgdir/usr/share/applications"
 
-  rm -rf "${pkgdir}${ICECATDIR}/"{dictionaries,hyphenation,searchplugins,plugins}
-  ln -sf /usr/share/hunspell            "${pkgdir}${ICECATDIR}/dictionaries"
-  ln -sf /usr/share/hyphen              "${pkgdir}${ICECATDIR}/hyphenation"
-  ln -sf /usr/lib/mozilla/plugins       "${pkgdir}${ICECATDIR}/plugins"
-  ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}${ICECATDIR}/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 -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/lib/${pkgname}-devel-${pkgver}"
-  rm -rf "${pkgdir}/usr/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 "${ICECATDIR}/${pkgname}-bin" "${pkgdir}${ICECATDIR}/$pkgname"
+  # Fix a bug with https-everywhere (duplicate rules)
+  rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD"
+
+  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
 }
 
 md5sums=('a135581da2fd2845f268d7ca91054c06'
          '9c0cd5b45a3c4b04b872b6a900f62286'
          '0e5057d9427c6cd5e2f3b78fe34f50d9'
          '44959606e4a704e68a913e73fc941926'
+         'e81ad01dbc16ba28bf92ba4b7c309ca7'
+         'd93fe402b87cd000a869e1fd6badc6c9'
          '07e65752416e615fe04ce586bc58f86b'
-         '037b44b6e07d7115e0fb221d67b94272'
+         '1e4bcac59e93d21fffa6a1d1ad235247'
+         '0d053487907de4376d67d8f499c5502b')
+md5sums=('a135581da2fd2845f268d7ca91054c06'
+         '9c0cd5b45a3c4b04b872b6a900f62286'
          'e81ad01dbc16ba28bf92ba4b7c309ca7'
-         'd93fe402b87cd000a869e1fd6badc6c9')
+         'd93fe402b87cd000a869e1fd6badc6c9'
+         '07e65752416e615fe04ce586bc58f86b'
+         '1e4bcac59e93d21fffa6a1d1ad235247'
+         'c382e35315047e4ca368d09383b39b8d')
diff --git a/mozilla-testing/icecat/firefox-install-dir.patch b/mozilla-testing/icecat/firefox-install-dir.patch
new file mode 100644
index 000000000..b6f9700b3
--- /dev/null
+++ b/mozilla-testing/icecat/firefox-install-dir.patch
@@ -0,0 +1,28 @@
+diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in
+--- mozilla-release.orig/config/autoconf.mk.in	2011-11-06 14:06:44.462920048 +0000
++++ mozilla-release/config/autoconf.mk.in	2011-11-06 14:20:45.124169469 +0000
+@@ -68,8 +68,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
+diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in
+--- mozilla-release.orig/js/src/config/autoconf.mk.in	2011-11-06 14:06:45.586263727 +0000
++++ mozilla-release/js/src/config/autoconf.mk.in	2011-11-06 14:21:01.770993669 +0000
+@@ -61,8 +61,8 @@
+ datadir		= @datadir@
+ mandir		= @mandir@
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ TOP_DIST	= @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/mozilla-testing/icecat/mozconfig b/mozilla-testing/icecat/mozconfig
index 5a04038be..c1305ac60 100644
--- a/mozilla-testing/icecat/mozconfig
+++ b/mozilla-testing/icecat/mozconfig
@@ -1,92 +1,57 @@
-# We are building the browser
-ac_add_options --enable-application=browser
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-
-# Branding
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-
-# GNUzilla things
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
+. $topsrcdir/browser/config/mozconfig
 
-# Operating system things
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
-ac_add_options --with-pthreads
-
-ac_add_options --enable-toolkit-cairo-gtk2
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-svg-renderer=cairo
 
-ac_add_options --disable-toolkit-qt
-
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --with-system-bz2
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
+# System libraries
 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
 
-ac_add_options --enable-freetype2
-ac_add_options --enable-pango
+# Features
 ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
 
-
-# Enable/Disable web technologies
-ac_add_options --enable-canvas
-ac_add_options --enable-canvas3d
-ac_add_options --enable-places
-ac_add_options --enable-smil
-ac_add_options --enable-svg
-
-# Enable/Disable "user-y" features
-ac_add_options --enable-extensions="default spellcheck"
-
-ac_add_options --disable-safe-browsing
-ac_add_options --enable-url-classifier
-ac_add_options --disable-chatzilla
-ac_add_options --disable-accessibility
-ac_add_options --disable-calendar
-ac_add_options --disable-composer
-
-# Enable/Disable "system-y" features
+ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
-ac_add_options --disable-debug
-ac_add_options --disable-installer
 ac_add_options --disable-updater
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-javaxpcom
-ac_add_options --enable-gio
-ac_add_options --enable-libnotify
-ac_add_options --enable-printing
-ac_add_options --enable-xinerama
-ac_add_options --enable-xterm-updates
-
-# Build settings
-ac_add_options --disable-mochitest
-ac_add_options --disable-pedantic
-ac_add_options --disable-static
 ac_add_options --disable-tests
-ac_add_options --enable-install-strip
-ac_add_options --enable-jemalloc
-ac_add_options --enable-optimize
-ac_add_options --enable-strip
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
 
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
+# Optimization
+ac_add_options --enable-optimize
 
 # PGO
 ac_add_options --enable-profile-guided-optimization
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
 mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+# IceCat
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
+
+# Parabola
+ac_add_options --disable-safe-browsing
+export BUILD_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
diff --git a/mozilla-testing/icecat/mozconfig.default b/mozilla-testing/icecat/mozconfig.default
index 21aaa0edd..01e047fc3 100644
--- a/mozilla-testing/icecat/mozconfig.default
+++ b/mozilla-testing/icecat/mozconfig.default
@@ -1,57 +1,35 @@
 # This is a better commented version of the default .mozconfig from 9.0.1
-
-# We are building the browser
 ac_add_options --enable-application=browser
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
 
-# Branding
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-
-# GNUzilla things
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-
-# Operating system things
 ac_add_options --prefix=/usr/local
 #ac_add_options --with-default-mozilla-five-home=/usr/local/lib
+
+# System libraries
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+#ac_add_options --with-system-png
+ac_add_options --disable-system-cairo 
 #ac_add_options --with-pthreads
 
+ac_add_options --disable-toolkit-qt
 ac_add_options --enable-toolkit-cairo-gtk2
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-svg-renderer=cairo
 
-ac_add_options --disable-toolkit-qt
-
-ac_add_options --disable-system-cairo 
-ac_add_options --with-system-jpeg
-#ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
+# Features
+ac_add_options --enable-extensions="default spellcheck"
 ac_add_options --enable-freetype2
 ac_add_options --enable-pango
-
-# Enable/Disable web technologies
 ac_add_options --enable-crypto
 #ac_add_options --enable-postscript
 ac_add_options --enable-svg
 ac_add_options --enable-xft
 
-# Enable/Disable "user-y" features
-ac_add_options --enable-extensions="default spellcheck"
-
 ac_add_options --disable-chatzilla
 ac_add_options --disable-accessibility
 ac_add_options --disable-calendar
 ac_add_options --disable-composer
 
-# Enable/Disable "system-y" features
-ac_add_options --disable-crashreporter
-ac_add_options --disable-debug
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-
 #ac_add_options --disable-jsd
 #ac_add_options --disable-libxul
 ac_add_options --disable-ipc
@@ -62,9 +40,24 @@ ac_add_options --disable-profilesharing
 ac_add_options --disable-xinerama
 ac_add_options --disable-xprint
 
-# Build settings
-ac_add_options --disable-elf-dynstr-gc
-ac_add_options --disable-mochitest 
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
 ac_add_options --disable-tests
+ac_add_options --disable-mochitest 
+ac_add_options --disable-installer
+
+ac_add_options --disable-debug
+
+# Optimization
+ac_add_options --disable-elf-dynstr-gc
 ac_add_options --enable-optimize="-pipe -O3"
 ac_add_options --enable-strip
+
+# IceCat
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
diff --git a/mozilla-testing/icecat/mozconfig.firefox b/mozilla-testing/icecat/mozconfig.firefox
new file mode 100644
index 000000000..428503642
--- /dev/null
+++ b/mozilla-testing/icecat/mozconfig.firefox
@@ -0,0 +1,46 @@
+# This is the .mozconfig used by Arch for Firefox
+. $topsrcdir/browser/config/mozconfig
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+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 --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
+
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
diff --git a/mozilla-testing/icecat/mozconfig.old b/mozilla-testing/icecat/mozconfig.old
index 3ae3e1c2e..a790aee48 100644
--- a/mozilla-testing/icecat/mozconfig.old
+++ b/mozilla-testing/icecat/mozconfig.old
@@ -1,85 +1,78 @@
 # This is a better commented version of the .mozconfig used by the Parabola
 # package < v9
-
-# We are building the browser
 . $topsrcdir/browser/config/mozconfig
 
-# Branding
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-
-# GNUzilla things
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-
-# Operating system things
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
-ac_add_options --with-pthreads
-
-ac_add_options --enable-default-toolkit=cairo-gtk2
 
-
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --with-system-bz2
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
+# System libraries
 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-cairo
+ac_add_options --with-pthreads
 
-ac_add_options --enable-pango
-ac_add_options --enable-startup-notification
+ac_add_options --enable-default-toolkit=cairo-gtk2
 
+# Features
+ac_add_options --enable-extensions=default
+
+ac_add_options --enable-url-classifier
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
 
-# Enable/Disable web technologies
 ac_add_options --enable-canvas
 ac_add_options --enable-canvas3d
 ac_add_options --enable-places
 ac_add_options --enable-smil
 ac_add_options --enable-svg
 
-# Enable/Disable "user-y" features
-ac_add_options --enable-extensions=default
-
-ac_add_options --disable-safe-browsing
-ac_add_options --enable-url-classifier
-
-# Enable/Disable "system-y" features
-ac_add_options --disable-crashreporter
-ac_add_options --disable-debug
-ac_add_options --disable-installer
-ac_add_options --disable-update
-
-ac_add_options --disable-gnomevfs
 ac_add_options --disable-javaxpcom
-ac_add_options --enable-gio
 ac_add_options --enable-libnotify
 ac_add_options --enable-printing
 ac_add_options --enable-xinerama
 ac_add_options --enable-xterm-updates
 
-# Build settings
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-update
+ac_add_options --disable-tests
 ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+ac_add_options --disable-debug
+
+# Optimization
 ac_add_options --disable-pedantic
 ac_add_options --disable-static
-ac_add_options --disable-tests
 ac_add_options --enable-install-strip
 ac_add_options --enable-jemalloc
 ac_add_options --enable-optimize
 ac_add_options --enable-strip
 
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
 # PGO
 ac_add_options --enable-profile-guided-optimization
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
 mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+# IceCat
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
+
+# Parabola
+ac_add_options --disable-safe-browsing
+export BUILD_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
diff --git a/mozilla-testing/icecat/parabola.patch b/mozilla-testing/icecat/parabola.patch
deleted file mode 100644
index b8000c3ea..000000000
--- a/mozilla-testing/icecat/parabola.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru icecat-9.0.1.orig/browser/app/profile/firefox.js icecat-9.0.1/browser/app/profile/firefox.js
---- icecat-9.0.1.orig/browser/app/profile/firefox.js	2011-12-27 00:11:30.000000000 -0500
-+++ icecat-9.0.1/browser/app/profile/firefox.js	2011-12-27 00:11:39.000000000 -0500
-@@ -48,6 +48,8 @@
- #endif
- #endif
- 
-+pref("general.startup.browser", true);
-+
- pref("browser.chromeURL","chrome://browser/content/");
- pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul");
- 
-@@ -487,6 +489,9 @@
- pref("browser.gesture.twist.left", "");
- pref("browser.gesture.tap", "cmd_fullZoomReset");
- 
-+// Use LANG environment variable to choose locale
-+pref("intl.locale.matchOS", true);
-+
- // 0=lines, 1=pages, 2=history , 3=text size
- #ifdef XP_MACOSX
- // On OS X, if the wheel has one axis only, shift+wheel comes through as a
diff --git a/mozilla-testing/icecat/vendor.js b/mozilla-testing/icecat/vendor.js
new file mode 100644
index 000000000..808d1b118
--- /dev/null
+++ b/mozilla-testing/icecat/vendor.js
@@ -0,0 +1,5 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
diff --git a/mozilla-testing/iceweasel-i18n/.gitignore b/mozilla-testing/iceweasel-i18n/.gitignore
index bff578e20..3e1eb57b5 100644
--- a/mozilla-testing/iceweasel-i18n/.gitignore
+++ b/mozilla-testing/iceweasel-i18n/.gitignore
@@ -1,3 +1,3 @@
-PKGBUILD.*
+PKGBUILD.list
 langpacks.txt
 *.diff.gz
diff --git a/mozilla-testing/iceweasel-i18n/Makefile b/mozilla-testing/iceweasel-i18n/Makefile
index a0a767c3d..64e140af6 100644
--- a/mozilla-testing/iceweasel-i18n/Makefile
+++ b/mozilla-testing/iceweasel-i18n/Makefile
@@ -5,32 +5,55 @@
 #  - pacman
 #  - sed
 
+# Variables:
+# This is to get it from Debian Sid
+debname=iceweasel-l10n
+debver=9.0+debian
+debrel=1
+debrepo=http://ftp.debian.org/debian/pool/main/
+
+pkgver=9.0
+pkgrel=2
+
+# Guts: ##############################################################
+
 default: PHONY all
 all: PHONY
 	$(MAKE) clean
 	$(MAKE) PKGBUILD
 .PRECIOUS: PKGBUILD
 
-PKGBUILD.g: Makefile
+PKGBUILD.list: Makefile
 	sed \
-	  -e '/This line is here/,$$d' \
-	  -e 's/^pkgname=/_pkgname=/' \
-	  PKGBUILD > $@
-	echo 'pkgname=foo' >> $@
+	  -e 's/@DEBNAME@/$(debname)/' \
+	  -e 's/@DEBVER@/$(debver)/' \
+	  -e 's/@DEBREL@/$(debrel)/' \
+	  -e 's%@DEBREPO@%$(debrepo)%' \
+	  -e 's/@PKGVER@/$(pkgver)/' \
+	  -e 's/@PKGREL@/$(pkgrel)/' \
+	  -e "s/@LANGPACKS@/(phony)/" \
+	  -e '/CUT HERE/,$$d' \
+	  PKGBUILD.in > $@
 	echo 'package() { exit 0; }' >> $@
 	makepkg -gp $@ >> $@
-langpacks.txt: PKGBUILD.g Makefile
+langpacks.txt: PKGBUILD.list Makefile
 	makepkg -dp $<
 	ls src/*/upstream | sed 's/\.xpi//' > $@
-PKGBUILD: langpacks.txt Makefile
+PKGBUILD: PKGBUILD.in langpacks.txt Makefile
 	sed \
-	  -e "s/_langpacks=.*/_langpacks=(`xargs echo < $<`)/" \
+	  -e 's/@DEBNAME@/$(debname)/' \
+	  -e 's/@DEBVER@/$(debver)/' \
+	  -e 's/@DEBREL@/$(debrel)/' \
+	  -e 's%@DEBREPO@%$(debrepo)%' \
+	  -e 's/@PKGVER@/$(pkgver)/' \
+	  -e 's/@PKGREL@/$(pkgrel)/' \
+	  -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \
+	  -e '/CUT HERE/d' \
 	  -e '/md5sums/,$$d' \
-	  $@ > $@.$$$$ && \
-	makepkg -g >> $@.$$$$ && \
-	mv $@.$$$$ $@
+	  PKGBUILD.in > $@
+	makepkg -dg >> $@
 
 clean: PHONY
-	rm -f PKGBUILD.g langpacks.txt
+	rm -f PKGBUILD.list langpacks.txt
 
 .PHONY: PHONY FORCE
diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD b/mozilla-testing/iceweasel-i18n/PKGBUILD
index 45555b019..8a744f7a5 100644
--- a/mozilla-testing/iceweasel-i18n/PKGBUILD
+++ b/mozilla-testing/iceweasel-i18n/PKGBUILD
@@ -1,10 +1,13 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: Figue <ffigue@gmail.com>
+# Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
-# - Update pkgver= and _deb*= below.
-# - Run "make". This will do everything else for you.
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
 
-# We're getting this from Debian Sid
 _debname=iceweasel-l10n
 _debver=9.0+debian
 _debrel=1
@@ -19,8 +22,7 @@ pkgname=($(for lang in ${_langpacks[@]}
         done))
 _pkgver=9.0
 pkgver=${_debver}.${_debrel}
-pkgrel=1
-
+pkgrel=2
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
@@ -28,21 +30,26 @@ url="http://www.geticeweasel.org/"
 license=('MPL')
 depends=("iceweasel=${_pkgver}")
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz")
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")
 noextract=($(for lang in ${_langpacks[@]}
         do echo $lang.xpi
         done))
 
-build() {
-  cd "${srcdir}"
+dpkg-source() {
   # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
   cd "${_debname}-${_debver}"
   patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff"
+  cd ..
+}
+
+build() {
+  cd "${srcdir}"
+  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
 }
 
 _path="/usr/lib/iceweasel-${_pkgver}/extensions"
 
-# This line is here for auto-regeneration purposes. DO NOT EDIT!
 
 for lang in ${_langpacks[@]}
 do
@@ -54,4 +61,5 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () {
 done
 
 md5sums=('d0dc0653b9d7642e6d346b54fb1782ae'
-         '493920a716fa40daeb5bd8cdfdbfe6a6')
+         '493920a716fa40daeb5bd8cdfdbfe6a6'
+         'd03f6db3a354e9208500898738506e50')
diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD.in b/mozilla-testing/iceweasel-i18n/PKGBUILD.in
new file mode 100644
index 000000000..691c80c0e
--- /dev/null
+++ b/mozilla-testing/iceweasel-i18n/PKGBUILD.in
@@ -0,0 +1,63 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: Figue <ffigue@gmail.com>
+# Based on icecat-i18n package, which is in turn based on firefox-i18n
+
+# When updating to a newer upstream release:
+# - Edit variables in in Makefile.
+# - (optionally) edit PKGBUILD.in
+# - Run 'make'. It will take care of everything else for you.
+
+_debname=@DEBNAME@
+_debver=@DEBVER@
+_debrel=@DEBREL@
+_debrepo=@DEBREPO@
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+
+_langpacks=@LANGPACKS@
+
+pkgbase=iceweasel-i18n
+pkgname=($(for lang in ${_langpacks[@]}
+        do echo $pkgbase-$lang | tr A-Z a-z
+        done))
+_pkgver=@PKGVER@
+pkgver=${_debver}.${_debrel}
+pkgrel=@PKGREL@
+
+pkgdesc="Language packs for Debian Iceweasel."
+arch=('any')
+url="http://www.geticeweasel.org/"
+license=('MPL')
+depends=("iceweasel=${_pkgver}")
+source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")
+noextract=($(for lang in ${_langpacks[@]}
+        do echo $lang.xpi
+        done))
+
+dpkg-source() {
+  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+  cd "${_debname}-${_debver}"
+  patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff"
+  cd ..
+}
+
+build() {
+  cd "${srcdir}"
+  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+}
+
+_path="/usr/lib/iceweasel-${_pkgver}/extensions"
+
+# CUT HERE <-- Separates package_*() functions from everything else.
+
+for lang in ${_langpacks[@]}
+do
+    eval "
+package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () {
+  install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
+}
+"
+done
+
diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD
new file mode 100644
index 000000000..3a3d7a561
--- /dev/null
+++ b/mozilla-testing/iceweasel-libre/PKGBUILD
@@ -0,0 +1,148 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: Henry Jensen <hjensen@connochaetos.org>
+
+# We're getting this from Debian Sid
+_debname=iceweasel
+_debver=9.0.1
+_debrel=1
+_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 browser based on Mozilla Firefox."
+arch=('i586' 'i686' 'x86_64' 'mips64el')
+license=('GPL2' 'MPL' '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>=3.13.1'
+  'sqlite3'
+  'startup-notification'
+)
+makedepends=(
+  'autoconf2.13'
+  'diffutils'
+  'libidl2'
+  'librsvg'
+  'mesa'
+  'p7zip-libre'
+  'pkg-config'
+  'python2'
+  'quilt'
+  'wireless_tools'
+  'yasm'
+  'zip'
+)
+url="http://www.geticeweasel.org/"
+install=iceweasel.install
+source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc"
+        mozconfig
+        xulrunner-copy-stub.patch
+        libre.patch
+        firefox-install-dir.patch
+        region.properties
+        vendor.js)
+
+if [ "$_pkgname" != "$pkgname" ]; then
+  provides+=("$_pkgname")
+  conflicts+=("$_pkgname")
+fi
+
+dpkg-source() {
+  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+  export QUILT_PATCHES=debian/patches
+  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
+  export QUILT_DIFF_ARGS='--no-timestamps'
+  mv mozilla-release "${_debname}-${_debver}"
+  mv debian "${_debname}-${_debver}"
+  cd "${_debname}-${_debver}"
+  quilt push -a
+  find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
+  cd ..
+}
+
+build() {
+  msg2 "Applying Debian patches..."
+  cd "${srcdir}"
+  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+
+  # This will make life more sane
+  cd "${srcdir}"
+  ln -s "${_debname}-${_debver}" "${_pkgname}-${pkgver}"
+
+  msg2 "Starting normal build..."
+  cd "$srcdir/$_pkgname-$pkgver"
+  
+  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+  patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname
+  patch -Np1 -i "${srcdir}/xulrunner-copy-stub.patch" # small fix
+  patch -Np1 -i "${srcdir}/libre.patch"
+  cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
+
+  # Fix PRE_RELEASE_SUFFIX
+  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
+    browser/base/Makefile.in
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
+  export PYTHON="/usr/bin/python2"
+  
+  LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
+  LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  kill $! || true
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$pkgname/defaults/pref"
+
+  brandingdir="debian/branding"
+  for i in 16x16 32x32 64x64; do
+    install -Dm644 "$brandingdir/default${i/x*/}.png" "$pkgdir/usr/share/icons/hicolor/$i/apps/$pkgname.png"
+  done
+  install -Dm644 "$brandingdir/iceweasel_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg"
+
+  install -d                                  "$pkgdir/usr/share/applications"
+  install -m644 debian/iceweasel.desktop      "$pkgdir/usr/share/applications"
+  #install -m644 debian/iceweasel-safe.desktop "$pkgdir/usr/share/applications"
+
+  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 -rf "$pkgdir"/usr/{include,lib/$pkgname-devel,share/idl}
+
+  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
+}
+
+md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'
+         '6cde9fe38df1434fdcc0f3a078b0238e'
+         'd9b5f2a893ad80da492aec8c9a7cbb7c'
+         'c401067e1ffcb8df5a53076845d28a88'
+         'a485a2b5dc544a8a2bd40c985d2e5813'
+         '8942889dfa6936dc034e9c2f3503325a'
+         '1e4bcac59e93d21fffa6a1d1ad235247'
+         'f1c76e7e244257856a386ca2de69bdf0'
+         '0d053487907de4376d67d8f499c5502b')
diff --git a/mozilla-testing/iceweasel-libre/firefox-install-dir.patch b/mozilla-testing/iceweasel-libre/firefox-install-dir.patch
new file mode 100644
index 000000000..b6f9700b3
--- /dev/null
+++ b/mozilla-testing/iceweasel-libre/firefox-install-dir.patch
@@ -0,0 +1,28 @@
+diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in
+--- mozilla-release.orig/config/autoconf.mk.in	2011-11-06 14:06:44.462920048 +0000
++++ mozilla-release/config/autoconf.mk.in	2011-11-06 14:20:45.124169469 +0000
+@@ -68,8 +68,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
+diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in
+--- mozilla-release.orig/js/src/config/autoconf.mk.in	2011-11-06 14:06:45.586263727 +0000
++++ mozilla-release/js/src/config/autoconf.mk.in	2011-11-06 14:21:01.770993669 +0000
+@@ -61,8 +61,8 @@
+ datadir		= @datadir@
+ mandir		= @mandir@
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ TOP_DIST	= @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/mozilla-testing/iceweasel-libre/iceweasel.install b/mozilla-testing/iceweasel-libre/iceweasel.install
new file mode 100644
index 000000000..c1fe8284a
--- /dev/null
+++ b/mozilla-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/mozilla-testing/iceweasel/libre.patch b/mozilla-testing/iceweasel-libre/libre.patch
index e29e22a67..6f1fe82ff 100644
--- a/mozilla-testing/iceweasel/libre.patch
+++ b/mozilla-testing/iceweasel-libre/libre.patch
@@ -1,156 +1,6 @@
-diff -urN iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js
---- iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js	2011-12-16 20:29:12.000000000 +0000
-+++ iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js	2011-12-21 12:55:22.404066176 +0000
-@@ -57,10 +57,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%&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%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%");
-+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);
-@@ -80,7 +80,7 @@
- pref("extensions.autoDisableScopes", 15);
- 
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html");
- 
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -200,7 +200,7 @@
- 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.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.
-@@ -235,7 +235,7 @@
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
- // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
- pref("browser.startup.page",                1);
--pref("browser.startup.homepage",            "chrome://branding/locale/browserconfig.properties");
-+pref("browser.startup.homepage",            "about:blank");
- 
- // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
- // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -325,7 +325,7 @@
- pref("browser.download.manager.resumeOnWakeDelay", 10000);
- 
- // 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");
- 
- // pointer to the default engine name
- pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
-@@ -564,7 +564,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);
-diff -urN iceweasel-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js
---- iceweasel-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js	2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js	2011-12-21 12:55:28.116066178 +0000
-@@ -57,10 +57,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%&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%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%");
-+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);
-@@ -80,7 +80,7 @@
- pref("extensions.autoDisableScopes", 15);
- 
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html");
- 
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -200,7 +200,7 @@
- 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.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.
-@@ -235,7 +235,7 @@
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
- // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
- pref("browser.startup.page",                1);
--pref("browser.startup.homepage",            "chrome://branding/locale/browserconfig.properties");
-+pref("browser.startup.homepage",            "about:blank");
- 
- // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
- // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -325,7 +325,7 @@
- pref("browser.download.manager.resumeOnWakeDelay", 10000);
- 
- // 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");
- 
- // pointer to the default engine name
- pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
-@@ -564,7 +564,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);
-diff -urN iceweasel-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js
---- iceweasel-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js	2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js	2011-12-21 10:10:35.104062780 +0000
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
- //  The first character after a period must be alphabetic.
- 
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js
---- iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js	2011-12-16 20:29:37.000000000 +0000
-+++ iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js	2011-12-21 10:10:43.184062783 +0000
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
- //  The first character after a period must be alphabetic.
- 
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0-orig/browser/app/profile/firefox.js iceweasel-9.0/browser/app/profile/firefox.js
---- iceweasel-9.0-orig/browser/app/profile/firefox.js	2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0/browser/app/profile/firefox.js	2011-12-21 12:54:53.816066166 +0000
+diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/browser/app/profile/firefox.js
+--- iceweasel-9.0.1.orig/browser/app/profile/firefox.js	2011-12-21 09:07:20.000000000 +0000
++++ iceweasel-9.0.1/browser/app/profile/firefox.js	2011-12-21 12:54:53.816066166 +0000
 @@ -57,10 +57,10 @@
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
@@ -189,7 +39,7 @@ diff -urN iceweasel-9.0-orig/browser/app/profile/firefox.js iceweasel-9.0/browse
  // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
  pref("browser.startup.page",                1);
 -pref("browser.startup.homepage",            "chrome://branding/locale/browserconfig.properties");
-+pref("browser.startup.homepage",            "about:blank");
++pref("browser.startup.homepage",            "about:home");
  
  // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
  // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
@@ -211,9 +61,9 @@ diff -urN iceweasel-9.0-orig/browser/app/profile/firefox.js iceweasel-9.0/browse
  
  // 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);
-diff -urN iceweasel-9.0-orig/browser/base/content/syncSetup.js iceweasel-9.0/browser/base/content/syncSetup.js
---- iceweasel-9.0-orig/browser/base/content/syncSetup.js	2011-12-16 20:29:12.000000000 +0000
-+++ iceweasel-9.0/browser/base/content/syncSetup.js	2011-12-21 10:05:15.888062669 +0000
+diff -urN iceweasel-9.0.1.orig/browser/base/content/syncSetup.js iceweasel-9.0.1/browser/base/content/syncSetup.js
+--- iceweasel-9.0.1.orig/browser/base/content/syncSetup.js	2011-12-16 20:29:12.000000000 +0000
++++ iceweasel-9.0.1/browser/base/content/syncSetup.js	2011-12-21 10:05:15.888062669 +0000
 @@ -59,7 +59,7 @@
  // Broader than we'd like, but after this changed from api-secure.recaptcha.net
  // we had no choice. At least we only do this for the duration of setup.
@@ -223,9 +73,9 @@ diff -urN iceweasel-9.0-orig/browser/base/content/syncSetup.js iceweasel-9.0/bro
  
  Cu.import("resource://services-sync/main.js");
  Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-diff -urN iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties
---- iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-21 09:55:31.032062468 +0000
+diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties
+--- iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-16 20:29:13.000000000 +0000
++++ iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-21 09:55:31.032062468 +0000
 @@ -1,8 +1,8 @@
  # Default search engine
 -browser.search.defaultenginename=Google
@@ -246,9 +96,9 @@ diff -urN iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.
  
  # 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 
-diff -urN iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in
---- iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in	2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in	2011-12-21 10:24:32.872063067 +0000
+diff -urN iceweasel-9.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-9.0.1/browser/locales/generic/profile/bookmarks.html.in
+--- iceweasel-9.0.1.orig/browser/locales/generic/profile/bookmarks.html.in	2011-12-16 20:29:13.000000000 +0000
++++ iceweasel-9.0.1/browser/locales/generic/profile/bookmarks.html.in	2011-12-21 10:24:32.872063067 +0000
 @@ -11,14 +11,12 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
@@ -256,6 +106,7 @@ diff -urN iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in i
 -        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
 -        <DT><A HREF="http://fxfeeds.mozilla.com/@AB_CD@/firefox/livebookmarks/" FEEDURL="http://fxfeeds.mozilla.com/@AB_CD@/firefox/headlines.xml" ID="rdf:#$HvPhC3">@latest_headlines@</A>
 +        <DT><A HREF="http://www.connochaetos.org/">ConnochaetOS</a>
++        <DT><A HREF="https://parabolagnulinux.org/">Parabola</a>
      </DL><p>
      <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
      <DL><p>
@@ -268,9 +119,9 @@ diff -urN iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in i
 +    <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</a>
      </DL><p>
  </DL><p>
-diff -urN iceweasel-9.0-orig/build/pgo/blueprint/elements.html iceweasel-9.0/build/pgo/blueprint/elements.html
---- iceweasel-9.0-orig/build/pgo/blueprint/elements.html	2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0/build/pgo/blueprint/elements.html	2011-12-21 10:04:42.988062659 +0000
+diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1/build/pgo/blueprint/elements.html
+--- iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html	2011-12-16 20:29:13.000000000 +0000
++++ iceweasel-9.0.1/build/pgo/blueprint/elements.html	2011-12-21 10:04:42.988062659 +0000
 @@ -143,7 +143,7 @@
        </p>
        <p>
@@ -280,9 +131,9 @@ diff -urN iceweasel-9.0-orig/build/pgo/blueprint/elements.html iceweasel-9.0/bui
        </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-9.0-orig/dom/ipc/test.xul iceweasel-9.0/dom/ipc/test.xul
---- iceweasel-9.0-orig/dom/ipc/test.xul	2011-12-16 20:29:17.000000000 +0000
-+++ iceweasel-9.0/dom/ipc/test.xul	2011-12-21 10:03:33.224062635 +0000
+diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul
+--- iceweasel-9.0.1.orig/dom/ipc/test.xul	2011-12-16 20:29:17.000000000 +0000
++++ iceweasel-9.0.1/dom/ipc/test.xul	2011-12-21 10:03:33.224062635 +0000
 @@ -301,6 +301,6 @@
                 oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
    </toolbar>
@@ -291,9 +142,9 @@ diff -urN iceweasel-9.0-orig/dom/ipc/test.xul iceweasel-9.0/dom/ipc/test.xul
 +  <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="page" remote="true"/>
    <label id="messageLog" value="" crop="center"/>
  </window>
-diff -urN iceweasel-9.0-orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0/layout/ipc/test-ipcbrowser.xul
---- iceweasel-9.0-orig/layout/ipc/test-ipcbrowser.xul	2011-12-16 20:29:28.000000000 +0000
-+++ iceweasel-9.0/layout/ipc/test-ipcbrowser.xul	2011-12-21 10:03:06.408062626 +0000
+diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul
+--- iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul	2011-12-16 20:29:28.000000000 +0000
++++ iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul	2011-12-21 10:03:06.408062626 +0000
 @@ -69,6 +69,6 @@
         label="setViewportScale"/>
    </toolbar>
@@ -302,9 +153,9 @@ diff -urN iceweasel-9.0-orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0/layout
 +  <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="content"
             remote="true"/>
  </window>
-diff -urN iceweasel-9.0-orig/mobile/app/mobile.js iceweasel-9.0/mobile/app/mobile.js
---- iceweasel-9.0-orig/mobile/app/mobile.js	2011-12-16 20:29:36.000000000 +0000
-+++ iceweasel-9.0/mobile/app/mobile.js	2011-12-21 10:04:04.976062646 +0000
+diff -urN iceweasel-9.0.1.orig/mobile/app/mobile.js iceweasel-9.0.1/mobile/app/mobile.js
+--- iceweasel-9.0.1.orig/mobile/app/mobile.js	2011-12-16 20:29:36.000000000 +0000
++++ iceweasel-9.0.1/mobile/app/mobile.js	2011-12-21 10:04:04.976062646 +0000
 @@ -217,12 +217,13 @@
  /* preferences for the Get Add-ons pane */
  pref("extensions.getAddons.cache.enabled", true);
@@ -334,9 +185,9 @@ diff -urN iceweasel-9.0-orig/mobile/app/mobile.js iceweasel-9.0/mobile/app/mobil
  
  pref("accessibility.typeaheadfind", false);
  pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-9.0-orig/mobile/locales/en-US/chrome/region.properties iceweasel-9.0/mobile/locales/en-US/chrome/region.properties
---- iceweasel-9.0-orig/mobile/locales/en-US/chrome/region.properties	2011-12-16 20:29:36.000000000 +0000
-+++ iceweasel-9.0/mobile/locales/en-US/chrome/region.properties	2011-12-21 09:54:17.560062443 +0000
+diff -urN iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties
+--- iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties	2011-12-16 20:29:36.000000000 +0000
++++ iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties	2011-12-21 09:54:17.560062443 +0000
 @@ -1,8 +1,8 @@
  # Default search engine
 -browser.search.defaultenginename=Google
@@ -357,9 +208,9 @@ diff -urN iceweasel-9.0-orig/mobile/locales/en-US/chrome/region.properties icewe
  
  # 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
-diff -urN iceweasel-9.0-orig/modules/libpref/src/init/all.js iceweasel-9.0/modules/libpref/src/init/all.js
---- iceweasel-9.0-orig/modules/libpref/src/init/all.js	2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0/modules/libpref/src/init/all.js	2011-12-21 10:09:17.136062754 +0000
+diff -urN iceweasel-9.0.1.orig/modules/libpref/src/init/all.js iceweasel-9.0.1/modules/libpref/src/init/all.js
+--- iceweasel-9.0.1.orig/modules/libpref/src/init/all.js	2011-12-21 09:07:20.000000000 +0000
++++ iceweasel-9.0.1/modules/libpref/src/init/all.js	2011-12-21 10:09:17.136062754 +0000
 @@ -47,7 +47,7 @@
  // SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
  //  The first character after a period must be alphabetic.
@@ -369,9 +220,9 @@ diff -urN iceweasel-9.0-orig/modules/libpref/src/init/all.js iceweasel-9.0/modul
  pref("keyword.enabled", false);
  pref("general.useragent.locale", "chrome://global/locale/intl.properties");
  pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0-orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-9.0/toolkit/locales/en-US/chrome/global-region/region.properties
---- iceweasel-9.0-orig/toolkit/locales/en-US/chrome/global-region/region.properties	2011-12-16 20:29:43.000000000 +0000
-+++ iceweasel-9.0/toolkit/locales/en-US/chrome/global-region/region.properties	2011-12-21 12:51:31.188066096 +0000
+diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties
+--- iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties	2011-12-16 20:29:43.000000000 +0000
++++ iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties	2011-12-21 12:51:31.188066096 +0000
 @@ -4,10 +4,10 @@
  pluginStartupMessage=Starting Plugin for type
  
diff --git a/mozilla-testing/iceweasel-libre/mozconfig b/mozilla-testing/iceweasel-libre/mozconfig
new file mode 100644
index 000000000..88e5ec422
--- /dev/null
+++ b/mozilla-testing/iceweasel-libre/mozconfig
@@ -0,0 +1,58 @@
+. $topsrcdir/browser/config/mozconfig
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+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 --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
+
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+# Iceweasel
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=debian/branding
+
+# ConnochaetOS
+#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
+
+# Parabola
+ac_add_options --disable-safe-browsing
+export BUILD_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
diff --git a/mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch b/mozilla-testing/iceweasel-libre/mozilla-firefox-1.0-lang.patch
index f0f7325a5..f0f7325a5 100644
--- a/mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch
+++ b/mozilla-testing/iceweasel-libre/mozilla-firefox-1.0-lang.patch
diff --git a/mozilla-testing/iceweasel/region.properties b/mozilla-testing/iceweasel-libre/region.properties
index 2e980987e..2e980987e 100644
--- a/mozilla-testing/iceweasel/region.properties
+++ b/mozilla-testing/iceweasel-libre/region.properties
diff --git a/mozilla-testing/iceweasel-libre/vendor.js b/mozilla-testing/iceweasel-libre/vendor.js
new file mode 100644
index 000000000..d8d606bc1
--- /dev/null
+++ b/mozilla-testing/iceweasel-libre/vendor.js
@@ -0,0 +1,9 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
diff --git a/mozilla-testing/iceweasel/xulrunner-copy-stub.patch b/mozilla-testing/iceweasel-libre/xulrunner-copy-stub.patch
index e3b8e9376..e3b8e9376 100644
--- a/mozilla-testing/iceweasel/xulrunner-copy-stub.patch
+++ b/mozilla-testing/iceweasel-libre/xulrunner-copy-stub.patch
diff --git a/mozilla-testing/iceweasel/PKGBUILD b/mozilla-testing/iceweasel/PKGBUILD
deleted file mode 100644
index 992476d43..000000000
--- a/mozilla-testing/iceweasel/PKGBUILD
+++ /dev/null
@@ -1,135 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Henry Jensen <hjensen@connochaetos.org>
-
-# We're getting this from Debian Sid
-_debname=iceweasel
-_debver=9.0.1
-_debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=iceweasel
-pkgname=iceweasel
-_pkgver=9.0
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-
-pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox."
-arch=('i586' 'i686' 'x86_64' 'mips64el')
-url="http://www.geticeweasel.org/"
-license=('GPL2' 'MPL' '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'
-  'sqlite3'
-  'startup-notification'
-)
-makedepends=(
-  'autoconf2.13'
-  'diffutils'
-  'libidl2'
-  'mesa'
-  'p7zip-libre'
-  'pkg-config'
-  'python2'
-  'quilt'
-  'wireless_tools'
-  'yasm'
-  'zip'
-)
-options=(!buildflags !distcc)
-install=iceweasel.install
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
-        mozconfig
-        libre.patch
-        # Default configuration
-        mozilla-firefox-1.0-lang.patch
-        xulrunner-copy-stub.patch
-        region.properties)
-
-build() {
-  msg2 "Applying Debian patches..."
-  cd "${srcdir}"
-  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
-  export QUILT_PATCHES=debian/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-  mv mozilla-release "${_debname}-${_debver}"
-  mv debian "${_debname}-${_debver}"
-  cd "${_debname}-${_debver}"
-  quilt push -a
-  find .pc -name .timestamp -delete # why isn't --no-timestamps doing this?
-
-  # This will make life more sane
-  cd "${srcdir}"
-  ln -s "${_debname}-${_debver}" "${_pkgname}-${pkgver}"
-
-  msg2 "Starting normal build..."
-  cd "${srcdir}/${_pkgname}-${pkgver}/"
-  patch -p1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
-  patch -p1 -i "${srcdir}/xulrunner-copy-stub.patch"
-  patch -p1 -i "${srcdir}/libre.patch"
-  
-  cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
-
-  msg2 "Starting build..."
-
-  cp "${srcdir}/mozconfig" .mozconfig
-  #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
-  ./configure
-  #touch config*
-  make MOZ_MAKE_FLAGS="${MAKEFLAGS}"
-
-  msg2 "Build complete"
-}
-
-package() {
-
-  cd "${srcdir}/${_pkgname}-${pkgver}/"
-  #make -j1 -f client.mk DESTDIR="${pkgdir}" install
-  make install DESTDIR="${pkgdir}"
-
-  msg2 "Finishing..."
-
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m755 -d ${pkgdir}/usr/share/pixmaps
-  install -m755 -d ${pkgdir}/usr/share/icons/hicolor/16x16/apps
-  install -m755 -d ${pkgdir}/usr/share/icons/hicolor/32x32/apps
-  install -m755 -d ${pkgdir}/usr/share/icons/hicolor/64x64/apps
-  install -m755 -d ${pkgdir}/usr/share/icons/hicolor/scalable/apps
-
-  install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/iceweasel.desktop ${pkgdir}/usr/share/applications/ || return 1
-  install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default16.png ${pkgdir}/usr/share/icons/hicolor/16x16/apps/iceweasel.png
-  install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default32.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/iceweasel.png
-  install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/iceweasel.png
-  install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/iceweasel_icon.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg
-  
-
-  rm -rf ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins
-  ln -sf /usr/lib/mozilla/searchplugins ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins
-
-  rm -rvf ${pkgdir}/usr/lib/iceweasel-devel-${_pkgver}
-  rm -rvf ${pkgdir}/usr/include
-
-}
-
-md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'
-         '6cde9fe38df1434fdcc0f3a078b0238e'
-         '5e2574eef71ee1437e2f8e7481c67893'
-         '9609e77182cc300e3fe9d4b0c7e7efb4'
-         'bd5db57c23c72a02a489592644f18995'
-         'a485a2b5dc544a8a2bd40c985d2e5813'
-         'f1c76e7e244257856a386ca2de69bdf0')
diff --git a/mozilla-testing/iceweasel/iceweasel.install b/mozilla-testing/iceweasel/iceweasel.install
deleted file mode 100644
index 376600ec2..000000000
--- a/mozilla-testing/iceweasel/iceweasel.install
+++ /dev/null
@@ -1,21 +0,0 @@
-#[ "${ICDIR}" = "" ] && ICECATDIR="/usr/lib/icecat"
-post_install () {
-	echo -e "\n >>> Please, source /etc/profile or logout and re-login to your desktop session"
-	echo -e " >>> If you installed some locale in the past or some stuff in libdir, please remove old /usr/lib/iceweasel* directories"
-	update-desktop-database -q
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	post_install $1
-}
-
-post_remove() {
-	update-desktop-database -q
-}
-
-#op=$1
-#shift
-
-#$op $*
diff --git a/mozilla-testing/iceweasel/mozconfig b/mozilla-testing/iceweasel/mozconfig
deleted file mode 100644
index 8344f6967..000000000
--- a/mozilla-testing/iceweasel/mozconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-#ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-pthreads
-ac_add_options --enable-optimize
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-strip
-ac_add_options --enable-pango
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-libxul
-ac_add_options --disable-crashreporter
-ac_add_options --disable-safe-browsing
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-xprint
-ac_add_options --disable-installer
-ac_add_options --disable-libnotify
-ac_add_options --disable-pedantic
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-mochitest
-ac_add_options --disable-updater
-ac_add_options --with-default-mozilla-five-home=/usr/lib/iceweasel
-
-ac_add_options --with-branding=debian/branding
-ac_add_options --build=i586-pc-linux-gnu
-ac_add_options --host=i586-pc-linux-gnu
-
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export USE_SHORT_LIBNAME=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options USE_SHORT_LIBNAME=1