Merge ssh://parabolagnulinux.org:1863/srv/git/abslibre

author: Márcio Alexandre Silva Delgado <coadde@lavabit.com> 2013-01-27 11:49:47 -0200
committer: Márcio Alexandre Silva Delgado <coadde@lavabit.com> 2013-01-27 11:49:47 -0200
commit: 387a6ac962ce6a21ccb27fa2cc494ea6e3d2b8cd (patch)
tree: e0ac407d773af321071153aa5c0138235cc1f25e
parent: b6fba38485fbddb58ea021c9b532e7fea84404b1 (diff)
parent: a98a7931923d702e17d7db3de4dd40cdcfb26885 (diff)
56 files changed, 849 insertions, 832 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index ac3046760..694358a07 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -6,8 +6,8 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.14
-pkgrel=1
+pkgver=0.9.15
+pkgrel=2
 pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)"
 arch=('i686' 'x86_64') 
 url="http://calibre-ebook.com/"
@@ -27,7 +27,7 @@ install=calibre.install
 source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('0a809b1c1378f95a69337b9bc8207493'
+md5sums=('2e87ac93bb2006e40001a4028945cee2'
          '42c07b43d575b5e7e7524bd7b9528f0e'
          '675cd87d41342119827ef706055491e7')
 
@@ -82,4 +82,10 @@ package() {
   # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/
   rm -rf "${pkgdir}/usr/bin/calibre-mount-helper"
   install -m 755 "${srcdir}/calibre-mount-helper" "${pkgdir}/usr/bin"
+
+  # Compiling bytecode FS33392
+  python2 -m compileall "${pkgdir}/usr/lib/calibre/"
+
+  # Compiling optimized bytecode FS33392
+  python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
 }
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 2bfa111f8..85f2b3414 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -9,7 +9,7 @@
 _pkgname=clementine
 pkgname=clementine-libre
 pkgver=1.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A music player and library organizer, without spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index fb422594c..51e1c0810 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 172494 2012-12-04 01:05:09Z tomegun $
+# $Id: PKGBUILD 175758 2013-01-21 11:40:12Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=filesystem
-pkgver=2012.12
+pkgver=2013.01
 pkgrel=1
 pkgdesc='Base filesystem for Parabola'
-arch=('any')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='https://parabolagnulinux.org'
 groups=('base')
@@ -78,6 +78,15 @@ package() {
 	done
 
 	#
+	# add lib symlinks
+	#
+	ln -s usr/lib ${pkgdir}/lib
+	[[ ${CARCH} = "x86_64" ]] && (
+		ln -s usr/lib ${pkgdir}/lib64
+		ln -s lib ${pkgdir}/usr/lib64
+	)
+
+	#
 	# install parabola(7) manpage
 	#
 	install -D -m644 ${srcdir}/parabola.7 usr/share/man/man7/parabola.7
diff --git a/libre/iceape-l10n/.gitignore b/libre/iceape-l10n/.gitignore
deleted file mode 100644
index 3e1eb57b5..000000000
--- a/libre/iceape-l10n/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-PKGBUILD.list
-langpacks.txt
-*.diff.gz
diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index 1170df1d5..be0a6dd07 100644
--- a/libre/iceape-l10n/PKGBUILD
+++ b/libre/iceape-l10n/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
@@ -11,7 +11,7 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceape
-_debver=2.7.11
+_debver=2.7.12
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,6 @@ pkgbase=iceape-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=2.7.11
 pkgver=${_debver}.${_debrel}
 pkgrel=1
 
@@ -31,13 +30,15 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/source/sid/iceape"
 license=('MPL')
 depends=("iceape-libre>=$pkgver")
-  
-source=()
+makedepends=('unzip' 'zip')
+source=('region.properties')
 for lang in ${_langpacks[@]}
 do
     source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
 done
 
+_path="/usr/lib/iceape/extensions"
+
 build() {
   cd "${srcdir}"
   for f in *.deb
@@ -45,10 +46,21 @@ build() {
       bsdtar xf $f
       bsdtar xf data.tar.gz
   done
-}
 
-_path="/usr/lib/iceape/extensions"
+  cd $srcdir/$_path
 
+  for i in ${_langpacks[@]}
+  do
+    cd $srcdir/$_path
+    unzip -q langpack-$i@iceape.mozilla.org.xpi -d $i
+    rm langpack-$i@iceape.mozilla.org.xpi
+    install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
+    cd $i
+    zip -q -r $srcdir/$_path/langpack-$i@iceape.mozilla.org.xpi .
+  done
+
+  cd $srcdir
+}
 
 for lang in ${_langpacks[@]}
 do
@@ -62,26 +74,27 @@ package_iceape-l10n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('fb27360aff6250e7d483803583a5cd78'
-         '236c7aacd7e6416a37aff95f7bfa6a80'
-         'f17d76128ab529415078cafe63b61d50'
-         '07a5c72158427db8c5a990be6eb2d036'
-         'fddbcf27d00f1f4d92fed197ace8dd1b'
-         '96eb3291200c44ffdc3ab1d1446f00b7'
-         '04dec3bee388ae66cd434342ab03074f'
-         'bdef8b38501e7d6805b5304ef2bf8425'
-         '90b5d0ab0ab2eb3b75e5f80cb6d289bb'
-         '97f940c39b84a90b0e16eaeca4fa7806'
-         '34644b44381ae1da46f2fa308fd1cf34'
-         'a6240664344798568276dd5dbdd27fb2'
-         '61aedef6a89b400584dde82b5e97ff0f'
-         'abe7a9172876b30c4677b1f4c2237fc9'
-         '60f3c543fbdb72cc12aef8f2369101ff'
-         'c002da281c0d0fa357f92edd2b8cd12c'
-         'c17ab30f25f05024879afdf85fa4c516'
-         '250a08a999d6d1d6086ffbd17d60fbb4'
-         '609ce8793ea0d5465da7195e4d956fef'
-         '060226599bac5bc8ddb64417ef1a0108'
-         'eaa827909690bfa8dfdc621164e23ca8'
-         '3fb66893b5ea3b959de48ef16fb26c74'
-         '6f2d77e767efa0b0d4cb56df9ccd0a2f')
+md5sums=('428246ef3fb64103ff2cf5eaae2a92ca'
+         '22a14a6a2f03d0004a1fa990892094ef'
+         'af2379ea50672fe37ff8550d5c9e20a0'
+         'e5975c3b1ffaa5fcb3f5203cdfe8e0fb'
+         '21fcbd011acc382f5ec7a32aa04562ef'
+         '8fbf821c811c55514a100ae5d5e9e844'
+         'bd8f18e0d0f233e0a1c1a518537798a5'
+         '037cbb6fe0576f7f5bbbf956928f01e1'
+         '56964b577fcb077a9b81d07c59cc5af3'
+         'd2fb622717114a921efb37f028f31c6c'
+         '6abe2dbab7fcbdaf43e77290ca6853c9'
+         '558a2d29be749f6506f774703c58952f'
+         '7abdc6eb4154b88509a6c4f119c943a7'
+         '5a4fad9c23c8d19833ac5c76ad9aca4a'
+         '8d45110acc90f388923f01fb9cfca947'
+         'd1acbe2ef1120e70d5365476aa8679f9'
+         '604de00ea6ee06565212804b0d499df3'
+         'ceee78a29bd2f947558f04489ee50f54'
+         'afc6e343f0635a3ee5b7a22af947e8b8'
+         '455bab7a596cb43ac4ad80cb89a78b25'
+         '92a985b40aec8b3726ba22f45667994d'
+         'bc8c98f0518617ed2220fb3bfb03e165'
+         '449c91720751538f09ad3d555dbe2fce'
+         '8843be8937963d094d4272ac33019082')
diff --git a/libre/iceape-l10n/region.properties b/libre/iceape-l10n/region.properties
new file mode 100644
index 000000000..4399d8db7
--- /dev/null
+++ b/libre/iceape-l10n/region.properties
@@ -0,0 +1,32 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Default search engine
+browser.search.defaultenginename=DuckDuckGo HTML
+
+# Search engine order (order displayed in the search bar dropdown)s
+browser.search.order.1=DuckDuckGo HTML
+browser.search.order.2=DuckDuckGo Lite
+browser.search.order.3=Seeks Search
+
+# 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://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 
+# profile database.  Note that "new" is defined as "has a different URL"; this
+# means that it's not possible to update the name of existing handler, so 
+# don't make any spelling errors here.
+gecko.handlerService.defaultHandlersVersion=3
+
+# The default set of protocol handlers for irc:
+gecko.handlerService.schemes.irc.0.name=Freenode
+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+
+# The default set of protocol handlers for ircs:
+gecko.handlerService.schemes.ircs.0.name=Freenode
+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 2595a36f9..c46631628 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Sid
 _debname=iceape
-_debver=2.7.11
+_debver=2.7.12
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,9 +11,9 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=1
 pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey."
-arch=('i586' 'i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
 makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-ply' 'librsvg' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
@@ -29,13 +29,13 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         ${_pkgname}-2.0-lang.patch
         clrf.patch
         libre.patch)
-md5sums=('40473b4c662975eda865e1fc35c4953b'
-         'f704b69cc0328c83edd6223420fbd412'
+md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908'
+         '1fb9c4affad5f030c4e3544aadeaeea2'
          '60ba9e8f2fafd20e41268af534a55ea7'
          '7266333e31731af8bb50c2eca8d0bd26'
          '25b6fe16ac24cd5c852213e5c1adb272'
          'c395d443a8c4c16880c7322bcf174743'
-         'ebe66195898c89644138ffc88ba26a24')
+         '3e0a275b57e5ccfeb7573e716693441a')
 
 build() {
   export QUILT_PATCHES=debian/patches
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
index 6273a05a9..e316dbf4c 100644
--- a/libre/iceape-libre/libre.patch
+++ b/libre/iceape-libre/libre.patch
@@ -47,13 +47,13 @@
 -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/
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
  
  # The default set of protocol handlers for ircs:
 -gecko.handlerService.schemes.ircs.0.name=Mibbit
 -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
 +gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
 --- comm-release.orig/mozilla/modules/libpref/src/init/all.js	2012-03-16 04:46:09.000000000 -0300
 +++ comm-release/mozilla/modules/libpref/src/init/all.js	2012-05-12 04:03:52.163831535 -0300
 @@ -47,7 +47,7 @@
diff --git a/libre/icecat-l10n/.gitignore b/libre/icecat-l10n/.gitignore
deleted file mode 100644
index 3987fdafb..000000000
--- a/libre/icecat-l10n/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-index.html
-langpacks.txt
-*.xpi
diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD
index 7ee93cf06..197e3e236 100644
--- a/libre/icecat-l10n/PKGBUILD
+++ b/libre/icecat-l10n/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
-# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
-
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 # Based on firefox-i18n package
 
 # When updating to a newer upstream release:
diff --git a/libre/iceweasel-l10n/.gitignore b/libre/iceweasel-l10n/.gitignore
deleted file mode 100644
index 3e1eb57b5..000000000
--- a/libre/iceweasel-l10n/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-PKGBUILD.list
-langpacks.txt
-*.diff.gz
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index b2b937601..8e0172208 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
-# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
@@ -11,7 +11,7 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=18.0
+_debver=18.0.1
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,9 +22,8 @@ pkgbase=iceweasel-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=18.0
 pkgver=$_debver.$_debrel
-pkgrel=5
+pkgrel=1
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
@@ -76,91 +75,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
 done
 
 md5sums=('428246ef3fb64103ff2cf5eaae2a92ca'
-         '08556c8d27a4313b5e67e655d2e1e828'
-         '9fa01f43db09b12cd724f94c28883a9e'
-         '0d1ef852709fcae1842105d675c22312'
-         '56247c867b52a19808ca72f7fceb349a'
-         'dd670bcc609c06139671bf953f26d7b8'
-         'df233884b68c8f37ff9b757b6480ae94'
-         'd2aa803c6e1d1ebbaf9d4f6ad73f2aa8'
-         'd0f512e8bf97110a60b16de59b15869b'
-         '54045555373497393ded8bccc0dc1784'
-         '61cb757a64268141518ed9dad4795106'
-         '62f338f7bcd7fb50ef2f61936c0e4990'
-         '97b2c6a0de5d60b4e5696973aedd3cfc'
-         'd916a0b470264a9271509ed7a109e360'
-         '6f442a2989b814f20f4b73975bc97a5c'
-         '6117d8d24dad056f143feb3e061702dd'
-         'c759f731a415f99a73e20090f4893184'
-         'b481b08da143ff45a84d32285249fcfd'
-         '828f9a5b69634b39d48bfdf472a957bd'
-         '12d4b6779cb50777303381d35f539c4c'
-         '8609fd343e1e91724f50d6833d3e2f82'
-         '331acfbad62badfd48713d9b461efcf3'
-         '49216a2ea50fcd01057bd7b0d14a78e2'
-         'b0738cf3f5ce546134150e082cffaf61'
-         '9f03cd24990c897e75594229517c1e9a'
-         '5667260492203f29bba1b2732ce20b77'
-         'a1dd5872ab73a1a14ce3e285138445da'
-         '03e82d09ba4026ab10df5cfc3b78ca5f'
-         '1e92e7b3725cdfa94fc705ab54c7c6aa'
-         '35d9a0ccfa3c95a3a56f29c7a5bc4e6b'
-         '656dbfb6ac9efbeb4e58b5b9fc5fda03'
-         '29a343077a3de07ce9bb3e4d24d6a11a'
-         '831e09a24d4d40cb1bb45f980b7fa251'
-         '8488c98293d6f16caf99cf556f999611'
-         '92b07db5dcb8fc95ac8f5706b94d7ed5'
-         'fa9ee1b85adbd15c46ca075d94e62a14'
-         '19383d5cb3ed6de8599118dd9f54889e'
-         'fdff305ce5b154b12907fa302419548c'
-         '24df7d71f1a70e8225e80d15a53d3777'
-         '793bfd1301c4e989e2f904ad9f6b3adc'
-         '06d4e4423df0908254e422d207292858'
-         'd53dce3f9b3a5de374dd6c10ebe3665c'
-         '382e5237a81fbbbaab499c5c6646b308'
-         '1da9f5ce8cbd3bdcc46f932b7458574f'
-         'd635c40c88a7430a2103c13cdf1b58d3'
-         'd1eac26314ade41883b24b91cd9e01c6'
-         '6e65dd6b8cb0fbd4395e548926043e70'
-         '97e8c9b3db047651a38f29366867c92e'
-         '87433742c0b21c7655988d5586667d77'
-         'ac5cab1c45e0accf718cf624c8545dea'
-         'd3f2ff9a817dff71fa05ffe5f3f45db8'
-         'd1909b644b4495343b6d041c15683ad2'
-         '5c79b17dd9d0d83f749f52d489b347a7'
-         '433f0456e52420955a3689d2b18b7a94'
-         '90ee54b793a100b74f1b91ca2acb103b'
-         '0544d0e7e26a0c07379f0c6ca22708d8'
-         'c75d55a574f525f5f08574cb01a2ee20'
-         'b43589a4b08112996c756db467015eab'
-         '82782fd09a815441622187ed8839b0ee'
-         '52de8e6386f0232d13c6768092089c23'
-         '091e065f1723fa7fa7701ced828e24ed'
-         'a036b50e5915e5b37257fa048e8d7a60'
-         '1037213a49539a069b9e223dacfbdc94'
-         '251b43c207b4fb0842a913e658f868c3'
-         '1aac06560c3a0957087eab1d2034eba3'
-         '964b3edfd3221d8e412ef695bd9a7b00'
-         '45a900da3f1cc4834b32b190c67c42af'
-         'cad9df2808fd8f009d27142a729f21d6'
-         '192eaff8883db984c42ee43e3a5303f4'
-         '1000e395379bc6ef3b9c2c891f615e44'
-         '1da3d8777bc0595dea09fdd7222b55f3'
-         '0fbdd7294e21936ae75aca56d4d7252c'
-         'af481ef78e4ffe7b4cbf892c5cb10cc2'
-         'fc884a9a8203c56196993f6ed65069ca'
-         '1bebdd6e194cbb746f81725e317eb9b4'
-         '4c75d146f27aa2a70b0219954baa8965'
-         'd832ceafecac23a0659f7a766f6d98de'
-         'ed056fa5b30ddf55042699713c629503'
-         '8e698f20270de2b2fbaf9c1f09257c06'
-         'e864caf42db46efbaa229f36af572ee4'
-         '013864da4a811e894ba1605e7f93e80e'
-         '69be7804b3d6a6bb5683554cbc324bed'
-         'efc6a8427f080706d7d590a7b0eacadd'
-         '40c41e04514e3cbcae33b15a062b3811'
-         '164850087cdf79d57569ee9d4e1a8d2d'
-         '226de7be23de61db7df718ef93f7c906'
-         'fb331d7fd4f1c853192111663e2672a0'
-         '5dd0a89e43aa0f263fc7c1d4302dbfd6'
-         '8e602db8304ddafad17fd8098125d37b')
+         '5bff9acef5bdfd10fff5e3f36ff7c8bc'
+         '5ada703cfdc40e32c5c145380e979e1a'
+         'e8b198ad4673ef12538f17e73529f9f8'
+         'ba77a8937f6d0bc84ad789950ef42c70'
+         'd940e1ccb7f501555500b17f5ea28e74'
+         '7325a84d999c3ea5f884cff15e1a4210'
+         'f35c32e53f07774efa39bec386aa35c6'
+         '2d2a628958c5ad0f66077ae1703f61ba'
+         '458c5cee205f12ced09f8baab1605e11'
+         '7271c461eb02608d193208c5da94280e'
+         'a505e69bf7cbb4caadcd5dfa67da1b78'
+         '0b0e10b39d115aedc1dfc0967068df95'
+         '09153faa23ca0a953aa22cc3989eba5e'
+         'da9779d4a64f1bbab1195c9801fb678c'
+         '1815468f85d1eea9f018a72bb83889d3'
+         '6103d52fb61b4bb7e921870ff05c98af'
+         'c3f0e46e2cfb68bf30363c92dcd9934d'
+         '5214d31f5cd5c077f09a0c275f936c25'
+         'ad4f664710dfa896b969f25b824d7086'
+         'ba2339dce1b84f0e7c0b77331572d6f5'
+         '28fb3e3e873cf5d03207e220eebf2ab0'
+         'a6f6ea487f6577ddf4cb2ef10ed5e401'
+         '8143ba212c6ef5f1dfc311ce84861450'
+         '5a6db78ee5cd6b41c02b7f65e666a045'
+         '63869ca68431ee4c7d3769f4ef8b68e1'
+         '5e87285fa518d1a95a7a63a2587497b7'
+         '969c213166c8ecd7cc752c557a1c056d'
+         '0c47f76ca2fb3d747be170fd61fa36cb'
+         '01f67291435616996e968f41259b91bd'
+         'f785b30e48ea4ee4af286325b020c545'
+         '58684c98cfc9d35d3d37f827268e72ac'
+         '2ec870106c72d0772f65f6a129547cb1'
+         '98d5cec52877790042830e8be41db1ca'
+         '654ee0ebb10cfbfe9b8b6540548f08e7'
+         '5a60a9cd96e0900a6cfbf37f7a68b715'
+         'e6e276eb4b8b7c1eb5a3593b07b9a84a'
+         '0c788fece8760fb61509c0fe1ac7eff4'
+         '98cba049bae024ae7dc7426f6adf09d2'
+         '2d37f79f57d38008e64c9a52a05c91a4'
+         'aeffb314945de717ef8a417653bcba3d'
+         '910b595a09b98f4eae1f4e6ddcae6ad5'
+         '9c5babdcd0ecbac8e487bed05cf5fe1a'
+         'f94018f378dcd11d8d63ebbd4a595ca1'
+         'bb4cc3cdb7995333babe6462d1aaef06'
+         '7a3d8e89625858fea797f33e7a426c25'
+         'd1fbf396db41d77da0b3f9f2528c8c96'
+         'cfa20a918d3adad42313fc2db86c63b8'
+         'fa213ce6abfa19a6067e64c149e90b27'
+         '8c2a0ec2e38504c6f4657d9f00c3b4f0'
+         '3ff17d0759b40c4d308b8f28b698dba1'
+         '2fc7cc5a0d2d0794c7f08156fd65619d'
+         'ed57c5f168e53cec827695ac4c18ec10'
+         'c8b05f70068e8a8255d8f28f3171df5f'
+         'adc1d1e78c6c42624b1e312be7dec90c'
+         '1f667156cd0b9e23effcbf8e26d01839'
+         'dd112d0dbbcc45b38036694e5c82a6aa'
+         'f37be06f19a3e6e60727466896bc6b65'
+         'ec947261ee12d58c1a9998ea8136f744'
+         'a3434e5da7b65559de7c4adcb14906d3'
+         'b8984e5ab770cd3f0fd70cbc33ba1150'
+         'a06634264be552d2e64189a761c7cc3c'
+         '417246fb8b66c806bdb903801f975627'
+         'b9e367b2d4f96ea111ae46c22801b0bf'
+         '0a245b319c1dc40ef95a24ca5b0fca9d'
+         '7a08d4e4d7a10f12a4d79fe96e2c1f51'
+         'f4d71f4e0a1794ccc25463cced9457d4'
+         '778089e056b6e8b1aaef1a4769153059'
+         'c3855b0c99342acddca0a7e6d9dc126f'
+         '9bbd6dbf2df859fcbbf366e753dfcdd6'
+         '338ea8d0681d2df2409a2398c3ae3694'
+         'e783a6e96d080413a60d1200fa0ac8a7'
+         'd1af3e947fc8a8aca39bec88aaeda708'
+         'e53c6a92a5533a706abb6abbe761508e'
+         '5d139a83f2b5e1625142f06a63147a28'
+         'd671a0fd8a4f8eb08d4b9ab52372d667'
+         'af9bf9f8a04dc898fad49083824fea6a'
+         '78184aa445a574ed6f57e926c7ab25c4'
+         '62f54d64f86204a45fc12557a4a76eb0'
+         '0ee43e97979aff7b7e2bb3d9e42a6e00'
+         '6fe3c2ed768593d942461f462fadd508'
+         '469ff3256c7322f15a71e0fd81e09f57'
+         '74bb076c39c409d9c795722d692561dc'
+         'fc439b2e9dfff5111d0fea9fdeef30de'
+         '546c8cac927262e9166e01f4634a22cb'
+         '1009936f51fad91899c6f0144040f174'
+         '700322fdfe534fa47579895c87a93808'
+         'fbdd5acbff2ef4d73665766d1f0cd815'
+         'b3cc9c95ce6146453c8929213b04d9fe')
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index 69fe5c072..f59454192 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -67,7 +67,7 @@ index d7fec75..d531b83 100644
  component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
  contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
 diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index a6598fe..8f83da8 100644
+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", {
@@ -78,12 +78,12 @@ index a6598fe..8f83da8 100644
 +FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
  FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
  
- const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
+ this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
 diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
-index 0669aa8..19552e3 100644
+index 1f60879..fc83a99 100644
 --- a/browser/components/migration/src/MigrationUtils.jsm
 +++ b/browser/components/migration/src/MigrationUtils.jsm
-@@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({
+@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({
     * @see nsIStringBundle
     */
    getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
@@ -95,7 +95,7 @@ index 0669aa8..19552e3 100644
      if (aReplacements === undefined)
        return getMigrationBundle().GetStringFromName(aKey);
      return getMigrationBundle().formatStringFromName(
-@@ -622,6 +617,17 @@ let MigrationUtils = Object.freeze({
+@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({
    },
  
    /**
@@ -114,7 +114,7 @@ index 0669aa8..19552e3 100644
     */
    finishMigration: function MU_finishMigration() {
 diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
-index 744f117..59e5a4c 100644
+index f67823b..36016b8 100644
 --- a/browser/components/migration/src/ProfileMigrator.js
 +++ b/browser/components/migration/src/ProfileMigrator.js
 @@ -12,6 +12,7 @@ function ProfileMigrator() {
@@ -184,10 +184,10 @@ index 260bc29..52b32cc 100644
 -64_firefox=Bookmarks Backups
 +64_self=Bookmarks Backups
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 339ffda..6999b26 100644
+index 687c8d8..203d8cf 100644
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -38,7 +38,7 @@ toolkit.jar:
+@@ -39,7 +39,7 @@ toolkit.jar:
  +  content/global/mozilla.xhtml               (mozilla.xhtml)
     content/global/nsDragAndDrop.js            (nsDragAndDrop.js)
     content/global/resetProfile.css            (resetProfile.css)
@@ -267,7 +267,7 @@ index f35c227..7062886 100644
  
  %{C++
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 68a52e6..02bb30e 100644
+index e3dd0df..ef7bb74 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
 @@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index e34ed131e..4f7d77337 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=false
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=18.0
+_debver=18.0.1
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=$_debver.$_debrel
-pkgrel=6
+pkgrel=1
 
 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
 if $_pgo; then
@@ -52,11 +52,10 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel-install-dir.patch
         vendor.js
         shared-libs.patch
-        bug677092.patch
         replace-urls.txt
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
-         '6a571d3a3b355c331f67d57702f4fccf'
+md5sums=('5d481dd35a304702d1f311eeb3f1149f'
+         '6a4781e8ddc1b166f36930c4864e095f'
          '619e8f7c8596838a7daf2b7ce2e54cd3'
          'ac29b01c189f20abae2f3eef1618ffc0'
          '1ee2d4bcacee73d671b9ffa17a02abaa'
@@ -64,9 +63,8 @@ md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '6dd547c72bb875a3101135a1c32d4783'
          '52e52f840a49eb1d14be1c0065b03a93'
-         '23520aca140fb0dd3e1b6f21b21f591f'
          'a8fc4658d45b6bf9350023e5c3f34e56'
-         '65f68090d2a69b467bd2707d0c4ea3bd')
+         '46a4b19b414065b99b870ea79b454f6e')
 
 if [ "$_pkgname" != "$pkgname" ]; then
   provides+=("$_pkgname=$pkgver")
@@ -100,11 +98,7 @@ build() {
   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"
-  
-  # 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
-  
+
   # Replace common URLs
   sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
     if [[ -n $moz_url ]]; then
@@ -115,12 +109,12 @@ build() {
         | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
     fi
   done
-  
+
   # Patch anything that's left
   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
diff --git a/libre/iceweasel-libre/bug677092.patch b/libre/iceweasel-libre/bug677092.patch
deleted file mode 100644
index aee09b451..000000000
--- a/libre/iceweasel-libre/bug677092.patch
+++ /dev/null
@@ -1,330 +0,0 @@
-exporting patch:
-# HG changeset patch
-# User Axel Hecht <axel@pike.org>
-# Date 1348128099 -7200
-# Node ID 812d0ba8317507c4026958a740960384eac1507a
-# Parent  97e49e7a33266a0680e5af59289264a07e4321f8
-bug 677092, make language packs restartless, r=Unfocused
-Make language packs just trigger the chrome registration hooks, and
-disable picking up bootstrap.js, and declare them restartless.
-
-diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/XPIProvider.jsm
---- a/toolkit/mozapps/extensions/XPIProvider.jsm	Wed Sep 26 13:08:50 2012 +0200
-+++ b/toolkit/mozapps/extensions/XPIProvider.jsm	Thu Sep 20 10:01:39 2012 +0200
-@@ -740,8 +740,8 @@
-     }
-   }
-   else {
--    // spell check dictionaries never require a restart
--    if (addon.type == "dictionary")
-+    // spell check dictionaries and language packs never require a restart
-+    if (addon.type == "dictionary" || addon.type == "locale")
-       addon.bootstrap = true;
-
-     // Only extensions are allowed to provide an optionsURL, optionsType or aboutURL. For
-@@ -3695,6 +3695,11 @@
-       Components.manager.addBootstrappedManifestLocation(aFile);
-
-     try {
-+      // Don't call bootstrap.js methods for language packs,
-+      // they only contain chrome.
-+      if (aType == "locale")
-+         return;
-+
-       // Load the scope if it hasn't already been loaded
-       if (!(aId in this.bootstrapScopes))
-         this.loadBootstrapScope(aId, aFile, aVersion, aType);
-diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest	Thu Sep 20 10:01:39 2012 +0200
-@@ -0,0 +1,1 @@
-+locale test-langpack    x-testing locale/x-testing
-diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf	Thu Sep 20 10:01:39 2012 +0200
-@@ -0,0 +1,23 @@
-+<?xml version="1.0"?>
-+
-+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-+
-+  <Description about="urn:mozilla:install-manifest">
-+    <em:id>langpack-x-testing@tests.mozilla.org</em:id>
-+    <em:type>8</em:type>
-+    <em:version>1.0</em:version>
-+
-+    <!-- Front End MetaData -->
-+    <em:name>Language Pack x-testing</em:name>
-+
-+    <em:targetApplication>
-+      <Description>
-+        <em:id>xpcshell@tests.mozilla.org</em:id>
-+        <em:minVersion>1</em:minVersion>
-+        <em:maxVersion>2</em:maxVersion>
-+      </Description>
-+    </em:targetApplication>
-+
-+  </Description>
-+</RDF>
-diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/test_langpack.js
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/toolkit/mozapps/extensions/test/xpcshell/test_langpack.js	Thu Sep 20 10:01:39 2012 +0200
-@@ -0,0 +1,247 @@
-+/* Any copyright is dedicated to the Public Domain.
-+ * http://creativecommons.org/publicdomain/zero/1.0/
-+ */
-+
-+// This verifies that language packs can be used without restarts.
-+Components.utils.import("resource://gre/modules/Services.jsm");
-+
-+// Enable loading extensions from the user scopes
-+Services.prefs.setIntPref("extensions.enabledScopes",
-+                          AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_USER);
-+
-+createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-+
-+const profileDir = gProfD.clone();
-+profileDir.append("extensions");
-+const userExtDir = gProfD.clone();
-+userExtDir.append("extensions2");
-+userExtDir.append(gAppInfo.ID);
-+registerDirectory("XREUSysExt", userExtDir.parent);
-+
-+var chrome = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
-+  .getService(Components.interfaces.nsIXULChromeRegistry);
-+
-+function do_check_locale_not_registered(provider) {
-+  let didThrow = false;
-+  try {
-+    chrome.getSelectedLocale(provider);
-+  } catch (e) {
-+    didThrow = true;
-+  }
-+  do_check_true(didThrow);
-+}
-+
-+function run_test() {
-+  do_test_pending();
-+
-+  startupManager();
-+
-+  run_test_1();
-+}
-+
-+// Tests that installing doesn't require a restart
-+function run_test_1() {
-+  prepare_test({ }, [
-+    "onNewInstall"
-+  ]);
-+
-+  AddonManager.getInstallForFile(do_get_addon("test_langpack"), function(install) {
-+    ensure_test_completed();
-+
-+    do_check_neq(install, null);
-+    do_check_eq(install.type, "locale");
-+    do_check_eq(install.version, "1.0");
-+    do_check_eq(install.name, "Language Pack x-testing");
-+    do_check_eq(install.state, AddonManager.STATE_DOWNLOADED);
-+    do_check_true(install.addon.hasResource("install.rdf"));
-+    do_check_false(install.addon.hasResource("bootstrap.js"));
-+    do_check_eq(install.addon.operationsRequiringRestart &
-+                AddonManager.OP_NEEDS_RESTART_INSTALL, 0);
-+
-+    let addon = install.addon;
-+    prepare_test({
-+      "langpack-x-testing@tests.mozilla.org": [
-+        ["onInstalling", false],
-+        "onInstalled"
-+      ]
-+    }, [
-+      "onInstallStarted",
-+      "onInstallEnded",
-+    ], function() {
-+      do_check_true(addon.hasResource("install.rdf"));
-+      check_test_1();
-+    });
-+    install.install();
-+  });
-+}
-+
-+function check_test_1() {
-+  AddonManager.getAllInstalls(function(installs) {
-+    // There should be no active installs now since the install completed and
-+    // doesn't require a restart.
-+    do_check_eq(installs.length, 0);
-+
-+    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+      do_check_neq(b1, null);
-+      do_check_eq(b1.version, "1.0");
-+      do_check_false(b1.appDisabled);
-+      do_check_false(b1.userDisabled);
-+      do_check_true(b1.isActive);
-+      // check chrome reg that language pack is registered
-+      do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing");
-+      do_check_true(b1.hasResource("install.rdf"));
-+      do_check_false(b1.hasResource("bootstrap.js"));
-+
-+      let dir = do_get_addon_root_uri(profileDir, "langpack-x-testing@tests.mozilla.org");
-+
-+      AddonManager.getAddonsWithOperationsByTypes(null, function(list) {
-+        do_check_eq(list.length, 0);
-+
-+        run_test_2();
-+      });
-+    });
-+  });
-+}
-+
-+// Tests that disabling doesn't require a restart
-+function run_test_2() {
-+  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+    prepare_test({
-+      "langpack-x-testing@tests.mozilla.org": [
-+        ["onDisabling", false],
-+        "onDisabled"
-+      ]
-+    });
-+
-+    do_check_eq(b1.operationsRequiringRestart &
-+                AddonManager.OP_NEEDS_RESTART_DISABLE, 0);
-+    b1.userDisabled = true;
-+    ensure_test_completed();
-+
-+    do_check_neq(b1, null);
-+    do_check_eq(b1.version, "1.0");
-+    do_check_false(b1.appDisabled);
-+    do_check_true(b1.userDisabled);
-+    do_check_false(b1.isActive);
-+    // check chrome reg that language pack is not registered
-+    do_check_locale_not_registered("test-langpack");
-+
-+    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) {
-+      do_check_neq(newb1, null);
-+      do_check_eq(newb1.version, "1.0");
-+      do_check_false(newb1.appDisabled);
-+      do_check_true(newb1.userDisabled);
-+      do_check_false(newb1.isActive);
-+
-+      run_test_3();
-+    });
-+  });
-+}
-+
-+// Test that restarting doesn't accidentally re-enable
-+function run_test_3() {
-+  shutdownManager();
-+  startupManager(false);
-+  // check chrome reg that language pack is not registered
-+  do_check_locale_not_registered("test-langpack");
-+
-+  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+    do_check_neq(b1, null);
-+    do_check_eq(b1.version, "1.0");
-+    do_check_false(b1.appDisabled);
-+    do_check_true(b1.userDisabled);
-+    do_check_false(b1.isActive);
-+
-+    run_test_4();
-+  });
-+}
-+
-+// Tests that enabling doesn't require a restart
-+function run_test_4() {
-+  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+    prepare_test({
-+      "langpack-x-testing@tests.mozilla.org": [
-+        ["onEnabling", false],
-+        "onEnabled"
-+      ]
-+    });
-+
-+    do_check_eq(b1.operationsRequiringRestart &
-+                AddonManager.OP_NEEDS_RESTART_ENABLE, 0);
-+    b1.userDisabled = false;
-+    ensure_test_completed();
-+
-+    do_check_neq(b1, null);
-+    do_check_eq(b1.version, "1.0");
-+    do_check_false(b1.appDisabled);
-+    do_check_false(b1.userDisabled);
-+    do_check_true(b1.isActive);
-+    // check chrome reg that language pack is registered
-+    do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing");
-+
-+    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) {
-+      do_check_neq(newb1, null);
-+      do_check_eq(newb1.version, "1.0");
-+      do_check_false(newb1.appDisabled);
-+      do_check_false(newb1.userDisabled);
-+      do_check_true(newb1.isActive);
-+
-+      run_test_5();
-+    });
-+  });
-+}
-+
-+// Tests that a restart shuts down and restarts the add-on
-+function run_test_5() {
-+  shutdownManager();
-+  startupManager(false);
-+  // check chrome reg that language pack is registered
-+  do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing");
-+
-+  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+    do_check_neq(b1, null);
-+    do_check_eq(b1.version, "1.0");
-+    do_check_false(b1.appDisabled);
-+    do_check_false(b1.userDisabled);
-+    do_check_true(b1.isActive);
-+    do_check_false(isExtensionInAddonsList(profileDir, b1.id));
-+
-+    run_test_7();
-+  });
-+}
-+
-+// Tests that uninstalling doesn't require a restart
-+function run_test_7() {
-+  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+    prepare_test({
-+      "langpack-x-testing@tests.mozilla.org": [
-+        ["onUninstalling", false],
-+        "onUninstalled"
-+      ]
-+    });
-+
-+    do_check_eq(b1.operationsRequiringRestart &
-+                AddonManager.OP_NEEDS_RESTART_UNINSTALL, 0);
-+    b1.uninstall();
-+
-+    check_test_7();
-+  });
-+}
-+
-+function check_test_7() {
-+  ensure_test_completed();
-+  // check chrome reg that language pack is not registered
-+  do_check_locale_not_registered("test-langpack");
-+
-+  AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) {
-+    do_check_eq(b1, null);
-+
-+    restartManager();
-+
-+    AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) {
-+      do_check_eq(newb1, null);
-+
-+      do_test_finished();
-+    });
-+  });
-+}
-diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
---- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	Wed Sep 26 13:08:50 2012 +0200
-+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	Thu Sep 20 10:01:39 2012 +0200
-@@ -139,6 +139,7 @@
- [test_corrupt_strictcompat.js]
- [test_db_sanity.js]
- [test_dictionary.js]
-+[test_langpack.js]
- [test_disable.js]
- [test_distribution.js]
- [test_dss.js]
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index 569568cb1..b7f394162 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173859 2012-12-26 01:09:36Z allan $
+# $Id: PKGBUILD 175812 2013-01-22 00:01:30Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,7 +6,7 @@
 
 pkgname=linux-libre-api-headers
 _basekernel=3.7
-_sublevel=1
+_sublevel=4
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 pkgdesc="Kernel headers sanitized for use in userspace"
@@ -19,7 +19,7 @@ replaces=('linux-api-headers')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz")
 md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
-         '6f4bb80d3d91b69daf5ccfea836d02df')
+         '0ce6896b7069cb5aaf444318d8db3885')
 
 build() {
   cd ${srcdir}/linux-${_basekernel}
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 335d35218..1aef0dc2e 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.7.1
-_kernrel=2
+_kernver=3.7.4
+_kernrel=1
 pkgname=('linux-libre-kmod-alx')
-_pkgver=2012-12-19-u
-pkgver=20121219
+_pkgver=2013-01-23-1-u
+pkgver=20130123
 pkgrel=1
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
@@ -16,9 +16,9 @@ install=linux-libre-kmod-alx.install
 replaces=('alx' 'alx-driver' 'dkms-alx')
 provides=('alx' 'alx-driver' 'dkms-alx')
 conflicts=('alx' 'alx-driver' 'dkms-alx')
-source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/19/compat-drivers-$_pkgver.tar.bz2)
+source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2013/01/23/compat-drivers-$_pkgver.tar.xz)
 
-md5sums=('60756fde830487042a525ff17ccfe7ab')
+md5sums=('4ba03ce3edf5a3fd2b79496284172d73')
 
 
 build() {
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 767609934..5bea880cd 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.57
+_kernver=3.0.60
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _pkgver=2012-12-04-1-u
 pkgver=20121204
-pkgrel=1
+pkgrel=2
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
@@ -16,9 +16,9 @@ install=linux-libre-lts-kmod-alx.install
 replaces=('alx' 'alx-driver' 'dkms-alx')
 provides=('alx' 'alx-driver' 'dkms-alx')
 conflicts=('alx' 'alx-driver' 'dkms-alx')
-source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2)
+source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.xz)
 
-md5sums=('bc46200e288acb862149a2af11f4b293')
+md5sums=('0759f5668d20f420d6d9dc6d854a2ceb')
 
 
 build() {
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 642d04d74..654edbf4c 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=58
+_sublevel=60
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.57 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.59 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '239e8b47a9760212772c3081f9a0a804'
+         '029dea7dd8bd815de241fff00d1bc2ab'
          '34c234b48d663bd4b04b45b9789bd107'
          '7ae9267fd5e8fd8993d9e2428e808afa'
          'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '21f93138b6d4410b095cc9998f89e47d')
+         'ffc297dd82534e15a09fabb882d28bc9')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 7af5d70e7..56b5f411d 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.58-1-LIBRE-LTS
+KERNEL_VERSION=3.0.60-1-LIBRE-LTS
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 7e988e5dc..d3c01f28c 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=linux-libre-tools
@@ -8,7 +8,7 @@ _basekernel=3.7
 #_sublevel=1
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
-pkgrel=3.1
+pkgrel=5
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -25,21 +25,15 @@ makedepends+=('glib2' 'sysfsutils')
 groups=("$pkgbase")
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
         #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
-        'cpupower.conf'
-        'cpupower.rc'
+        'cpupower.default'
         'cpupower.systemd'
         'cpupower.service'
-        'usbipd.conf'
-        'usbipd.rc'
         'usbipd.service')
 md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
          '56883c159381ba89e50ab8ea65efec77'
-         '5fc1fcda4cef93f16e752b1931db23e3'
-         'c0d17b5295fe964623c772a2dd981771'
+         '7e0710c2f31c1eb1e1417a7972e676b1'
          '2450e8ff41b30eb58d43b5fffbfde1f4'
-         'e8fac9c45a628015644b4150b139278a'
-         '8a3831d962ff6a9968c0c20fd601cdec'
-         'ba7c1c513314dd21fb2334fb8417738f')
+         'a8fb0c6159bee1b9e345a87cabb3ba27')
 
 build() {
   # apply stable patching set
@@ -101,7 +95,7 @@ package_libtraceevent-libre() {
 
 package_perf-libre() {
   pkgdesc='Linux kernel performance auditing tool'
-  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
+  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils')
   replaces=('perf')  
   conflicts=('perf')
   provides=("perf=$pkgver")
@@ -119,11 +113,12 @@ package_perf-libre() {
 
 package_cpupower-libre() {
   pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor'
-  backup=('etc/conf.d/cpupower')
+  backup=('etc/default/cpupower')
   depends=('bash' 'pciutils')
   replaces=('cpupower' 'cpufrequtils')
   conflicts=('cpupower' 'cpufrequtils')
   provides=("cpupower=$pkgver")
+  install=cpupower.install
 
   pushd linux-$pkgver/tools/power/cpupower
   make \
@@ -133,8 +128,7 @@ package_cpupower-libre() {
     install install-man
   popd
   # install startup scripts
-  install -Dm 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
-  install -Dm 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
+  install -Dm 644 cpupower.default "$pkgdir/etc/default/cpupower"
   install -Dm 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
   install -Dm 755 cpupower.systemd "$pkgdir/usr/lib/systemd/scripts/cpupower"
 }
@@ -165,9 +159,7 @@ package_usbip-libre() {
   # module loading
   install -Dm 644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
   printf 'usbip-core\nusbip-host\n' > "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
-  # install daemon scripts
-  install -Dm 755 usbipd.rc "$pkgdir/etc/rc.d/usbipd"
-  install -Dm 644 usbipd.conf "$pkgdir/etc/conf.d/usbipd"
+  # systemd
   install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
 }
 
diff --git a/libre/linux-libre-tools/cpupower.conf b/libre/linux-libre-tools/cpupower.default
index b5c522ea1..b5c522ea1 100644
--- a/libre/linux-libre-tools/cpupower.conf
+++ b/libre/linux-libre-tools/cpupower.default
diff --git a/libre/linux-libre-tools/cpupower.install b/libre/linux-libre-tools/cpupower.install
new file mode 100644
index 000000000..10e07ae52
--- /dev/null
+++ b/libre/linux-libre-tools/cpupower.install
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if [ "$(vercmp $2 3.7-4)" -le 0 ]; then
+    cat << EOF
+===> cpupower startup config file moved to /etc/default/cpupower
+EOF
+    fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc
deleted file mode 100644
index 88edaf791..000000000
--- a/libre/linux-libre-tools/cpupower.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start|restart)
-    status 'Setting cpupower rules' /usr/lib/systemd/scripts/cpupower || exit 1
-  ;;
-  *)
-    echo "usage: ${0##*/} {start|restart}" >&2
-    exit 1
-  ;;
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.systemd b/libre/linux-libre-tools/cpupower.systemd
index f45b02bc8..51c645415 100644
--- a/libre/linux-libre-tools/cpupower.systemd
+++ b/libre/linux-libre-tools/cpupower.systemd
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /etc/conf.d/cpupower
+. /etc/default/cpupower
 
 declare -i fail=0
 
diff --git a/libre/linux-libre-tools/usbipd.conf b/libre/linux-libre-tools/usbipd.conf
deleted file mode 100644
index 5990b857a..000000000
--- a/libre/linux-libre-tools/usbipd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-DAEMON_OPTS=''
diff --git a/libre/linux-libre-tools/usbipd.rc b/libre/linux-libre-tools/usbipd.rc
deleted file mode 100644
index 15a1bcf00..000000000
--- a/libre/linux-libre-tools/usbipd.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-DAEMON=/usr/sbin/usbipd
-PID=$(pidof -o %PPID $DAEMON)
-DAEMON_OPTS="--daemon $DAEMON_OPTS"
-
-case "$1" in
-	start)
-		stat_busy "Starting ${0##*/} daemon"
-		[[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0
-		stat_fail
-	;;
-  stop)
-		stat_busy "Stopping ${0##*/} daemon"
-		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
-		stat_fail
-	;;
-  restart)
-		$0 stop
-		$0 start
-		exit 0
-	;;
-  *)
-		echo "usage: ${0##*/} {start|stop|restart}" >&2
-	;;
-esac
-
-exit 1
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/usbipd.service b/libre/linux-libre-tools/usbipd.service
index ac2f5f7c1..1f3da08db 100644
--- a/libre/linux-libre-tools/usbipd.service
+++ b/libre/linux-libre-tools/usbipd.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=USB/IP server
+After=network.target
 
 [Service]
 ExecStart=/usr/sbin/usbipd
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 5cb275f5e..5219ea17c 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.7
-_sublevel=2
+_sublevel=4
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -30,11 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'fat-3.6.x.patch'
-        'fix-watchdog-3.7.patch'
-        'drm-fix-track-free-areas-3.7.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
-         '60acd5c68e27a2b31ab8993f91ae7938'
+         '0ce6896b7069cb5aaf444318d8db3885'
          '741f96278cbf12996166128a4657ce58'
          '0665c18c1ba3abbea5cd4cde91300854'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -43,9 +41,7 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '88d501404f172dac6fcb248978251560'
-         '3485d6c7ae3af35d16e09d6d9a7ed32a'
-         'e365972f002482a7b25cd5360467d75f'
-         'b56c33eaee920970151fffdfc7df0766')
+         'c5dd4404c6f6ae3771f1440107dea240')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -74,13 +70,6 @@ build() {
   # https://bugs.archlinux.org/task/32916
   patch -Np1 -i "${srcdir}/fat-3.6.x.patch"
 
-  # fix watchdog enable/disable regression
-  # https://bugs.archlinux.org/task/33095
-  patch -Np1 -i "${srcdir}/fix-watchdog-3.7.patch"
-  # fix GPU hang
-  # https://bugs.archlinux.org/task/33160
-  patch -Np1 -i "${srcdir}/drm-fix-track-free-areas-3.7.patch"
-
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index e958abbf4..155eefe9f 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.7.2-1-LIBRE
+KERNEL_VERSION=3.7.4-1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD
index 9117277a7..6563cff19 100644
--- a/libre/pacman-mirrorlist-libre/PKGBUILD
+++ b/libre/pacman-mirrorlist-libre/PKGBUILD
@@ -15,7 +15,7 @@ source=(mirrorlist::${url})
 conflicts=(pacman-mirrorlist)
 replaces=(pacman-mirrorlist)
 provides=(pacman-mirrorlist)
-md5sums=('83cc258f57e6e9501246270bf776849e')
+md5sums=('0ee6833595a007a60ca36eca98ae9781')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -24,4 +24,3 @@ build() {
   mkdir -p $pkgdir/etc/pacman.d
   install -m644 $srcdir/mirrorlist $pkgdir/etc/pacman.d/
 }
-
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 1833f020e..b19bb5ba7 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
 pkgver=4.2.6
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index c51bd04ef..c8cc9d72b 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=xchat
 pkgname=xchat-libre
 pkgver=2.8.8
-pkgrel=11
+pkgrel=11.1
 pkgdesc="A GTK+ based IRC client without non-free browser reference"
 arch=('i686' 'x86_64')
 url="http://www.xchat.org/"
@@ -32,8 +32,8 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
           'a053fba4e1911d1ee6a8248fe19e344797920fe3'
           '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1'
           'aecaf6176a7cfd62555207b02f2793b360aa39da'
-          'ead8947ae0033735803a0353e3b9d23f40fff990'
-          'aae58e189481e336825f8b56bf6939d55b2e42f3')
+          '5a58642e7da870e1d32f7c5da4e61b5c036f76eb'
+          '20aef0ae608af6b30e1b4249f9c53830f8f514f6')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat-libre/no-firefox.patch
index f1ecd6631..60c4846ee 100644
--- a/libre/xchat-libre/no-firefox.patch
+++ b/libre/xchat-libre/no-firefox.patch
@@ -1,11 +1,16 @@
---- xchat-2.8.8/src/fe-gtk/fe-gtk.c_orig	2011-06-02 04:25:03.386077554 +0200
-+++ xchat-2.8.8/src/fe-gtk/fe-gtk.c	2011-06-02 04:25:14.959410608 +0200
-@@ -956,7 +956,7 @@
+diff -Nur xchat-2.8.8.orig/src/fe-gtk/fe-gtk.c xchat-2.8.8/src/fe-gtk/fe-gtk.c
+--- xchat-2.8.8.orig/src/fe-gtk/fe-gtk.c	2010-05-16 00:15:42.000000000 -0300
++++ xchat-2.8.8/src/fe-gtk/fe-gtk.c		2013-01-19 02:11:00.691529212 -0200
+@@ -955,8 +955,10 @@
+ 			return;
  	}
  
- 	/* everything failed, what now? just try firefox */
+-	/* everything failed, what now? just try firefox */
 -	if (try_browser ("firefox", NULL, url))
++	/* everything failed, what now? just try iceweasel or icecat */
 +	if (try_browser ("iceweasel", NULL, url))
++		return;
++	if (try_browser ("icecat", NULL, url))
  		return;
  
  	/* fresh out of ideas... */
diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat-libre/remove-non-free-suggestion.patch
index 9383db521..ab4b3dc7b 100644
--- a/libre/xchat-libre/remove-non-free-suggestion.patch
+++ b/libre/xchat-libre/remove-non-free-suggestion.patch
@@ -1,12 +1,13 @@
-diff -urN xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c
---- xchat-2.8.8.orig/src/common/xchat.c	2010-05-16 07:04:45.000000000 +0000
-+++ xchat-2.8.8/src/common/xchat.c	2010-11-09 15:29:23.322458751 +0000
-@@ -602,7 +602,7 @@
+diff -Nur xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c
+--- xchat-2.8.8.orig/src/common/xchat.c		2010-05-16 04:04:45.000000000 -0300
++++ xchat-2.8.8/src/common/xchat.c		2013-01-19 01:56:02.243813379 -0200
+@@ -602,7 +602,8 @@
  	"NAME WII\n"			"CMD quote WHOIS %2 %2\n\n";
  
  static char defaultconf_urlhandlers[] =
 -		"NAME Open Link in Opera\n"		"CMD !opera -remote 'openURL(%s)'\n\n";
-+		"NAME Open Link in Web Browser\n"		"CMD !iceweasel '%s'\n\n";
++		"NAME Open Link in Iceweasel\n"			"CMD !iceweasel '%s'\n\n"\
++		"NAME Open Link in GNU IceCat\n"		"CMD !icecat '%s'\n\n";
  
  #ifdef USE_SIGACTION
  /* Close and open log files on SIGUSR1. Usefull for log rotating */
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 009d47398..47c9788c9 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -4,15 +4,17 @@
 # Run `makepkg -sp SRCBUILD` if you want to update the source tarball
 
 pkgname=pandoc
-pkgver=1.9.4.5
-pkgrel=5
+pkgver=1.10.0.4
+pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=('ghc' 'sh' 'cabal-install')
-options=(strip !makeflags !distcc)
-source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD)
+options=(strip !makeflags !distcc !emptydirs)
+source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
+        SRCBUILD
+        citeproc-hs-pre-0.3.7.patch)
 conflicts=('haskell-pandoc')
 optdepends=('texlive-most: for pdf creation')
 
@@ -21,7 +23,17 @@ build() {
     mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
     cd ${srcdir}/${pkgname}-${pkgver}
 
+# Patches from the next citeproc-hs release
+# These are needed because 0.3.6 with embed_data_files is broken
+# darcs diff --from-tag=0.3.6
+   pushd ${srcdir}/${pkgname}-${pkgver}/citeproc-hs-0.3.6
+   patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
+   popd
+
    while read _hkpkg; do
+# Skip already built
+       [ -d ${srcdir}/build/usr/lib/$_hkpkg ] && continue
+
        pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null
 
        msg2 "Building $_hkpkg"
@@ -59,16 +71,23 @@ package() {
 
   runghc Setup.hs copy --destdir=${pkgdir}/
 
+# For some reason the library is installed anyway
+# Remove all files and !emptydirs takes care of the rest
   msg2 "Removing lib files..."
-  rm -rfv ${pkgdir}/build
+  find ${pkgdir} -iname lib -print0 | xargs -0 rm -rvf
 
 # EC is unfree and makes Parabola TeXLive cry
 # besides, it's unneeded
-  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/templates/default.latex
+  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/data/templates/default.latex
 
   find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
   find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
+
+  msg2 "Installing licenses"
+  install -d ${pkgdir}/usr/share
+  cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/
 }
-md5sums=('af01e55daded42fa54e8a2bb142c0a78'
-         '96d0ba0d9060574e56e3f23c996d0e8e'
-         '54b521d5c3ed5e2b53c4ca3206f6c941')
+md5sums=('94c36d52ee6d7e33b16d75048f6617d3'
+         '2958854a387ea0845720e9456f814845'
+         'd159a34656b7a1e13df5e6149b2f898b'
+         'd389fc323eeaced767cea53edcfc0127')
diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD
index 1eb01acc1..c1cfbfa5c 100644
--- a/pcr/pandoc/SRCBUILD
+++ b/pcr/pandoc/SRCBUILD
@@ -2,12 +2,11 @@
 # Based on haskell-pandoc
 
 pkgname=pandoc
-pkgver=1.9.4.5
-# 0.3.6 fails with embed_data_files
-_citeproc=0.3.5
+pkgver=1.10.0.4
 # 0.4 doesn't work with ghc 7.6 
+# Use blaze_html_0_5 flag in the future
 _blaze_html=0.5.1.3
-pkgrel=5
+pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
@@ -25,12 +24,12 @@ build() {
     cabal --verbose=3 update
 
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver}
+    cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver}
 
     msg2 "Getting the dependency build order"
 # Ignore the cabal messages
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal install --dry-run file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER 
+    cabal install --dry-run file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER 
 }
 
 package() {
diff --git a/pcr/pandoc/citeproc-hs-pre-0.3.7.patch b/pcr/pandoc/citeproc-hs-pre-0.3.7.patch
new file mode 100644
index 000000000..754a9ac2e
--- /dev/null
+++ b/pcr/pandoc/citeproc-hs-pre-0.3.7.patch
@@ -0,0 +1,292 @@
+Fri Nov  9 09:31:27 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * fix issue #28
+  add support for generating links to the DOI database.
+Thu Nov  8 21:05:02 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * fix issue #35
+Thu Nov  8 18:24:16 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * a simple script for creating tests
+Thu Nov  8 18:21:56 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * fix a bug in convertQuoted which was producing stack overflows with long strings
+Thu Nov  8 17:27:38 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * fix editJsonInput in order to read the native JSON bibliographic data format
+Thu Nov  8 14:03:26 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * fix issue #37
+Fri Oct 26 18:45:09 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  * bump version number
+Fri Oct 26 13:53:20 ART 2012  Andrea Rossato <andrea.rossato@unitn.it>
+  tagged 0.3.6
+diff -rN -u old-citeproc-hs/README new-citeproc-hs/README
+--- old-citeproc-hs/README	2013-01-22 22:19:52.097159333 -0300
++++ new-citeproc-hs/README	2013-01-22 22:19:52.107159567 -0300
+@@ -169,6 +169,21 @@
+ 
+     Summer, 2001 (the season)
+ 
++### The DOI variable
++
++If the DOI variable is prefixed by a `doi:` like:
++
++        doi = {doi:10.1038/171737a0}
++
++the processor will generate a link and produce this pandoc native
++representation:
++
++       Link [Str "10.1038/171737a0"] ("http://dx.doi.org/10.1038/171737a0", "10.1038/171737a0")
++
++that produces a link like:
++
++       <a href="http://dx.doi.org/10.1038/171737a0">10.1038/171737a0</a>
++
+ ### Running the test-suite
+ 
+ To run the test suite, you first need to grab it with [mercurial] by
+diff -rN -u old-citeproc-hs/citeproc-hs.cabal new-citeproc-hs/citeproc-hs.cabal
+--- old-citeproc-hs/citeproc-hs.cabal	2013-01-22 22:19:52.103826157 -0300
++++ new-citeproc-hs/citeproc-hs.cabal	2013-01-22 22:19:52.107159567 -0300
+@@ -1,5 +1,5 @@
+ name:               citeproc-hs
+-version:            0.3.6
++version:            0.3.7
+ homepage:           http://gorgias.mine.nu/repos/citeproc-hs/
+ synopsis:           A Citation Style Language implementation in Haskell
+ 
+diff -rN -u old-citeproc-hs/src/Text/CSL/Eval/Output.hs new-citeproc-hs/src/Text/CSL/Eval/Output.hs
+--- old-citeproc-hs/src/Text/CSL/Eval/Output.hs	2013-01-22 22:19:52.097159333 -0300
++++ new-citeproc-hs/src/Text/CSL/Eval/Output.hs	2013-01-22 22:19:52.123826603 -0300
+@@ -29,7 +29,11 @@
+ appendOutput fm xs = if xs /= [] then [Output xs fm] else []
+ 
+ outputList :: Formatting -> Delimiter -> [Output] -> [Output]
+-outputList fm d = appendOutput fm . addDelim d
++outputList fm d = appendOutput fm . addDelim d . map cleanOutput'
++    where
++      cleanOutput' o
++          | Output xs f <- o = Output (cleanOutput xs) f
++          | otherwise        = rmEmptyOutput o
+ 
+ cleanOutput :: [Output] -> [Output]
+ cleanOutput = flatten
+@@ -37,12 +41,16 @@
+       flatten [] = []
+       flatten (o:os)
+           | ONull       <- o     = flatten os
+-          | Output [] _ <- o     = flatten os
+-          | OStr []   _ <- o     = flatten os
+-          | OUrl []   _ <- o     = flatten os
+           | Output xs f <- o
+           , f == emptyFormatting = flatten xs ++ flatten os
+-          | otherwise            = o : flatten os
++          | otherwise            = rmEmptyOutput o : flatten os
++
++rmEmptyOutput :: Output -> Output
++rmEmptyOutput o
++    | Output [] _ <- o = ONull
++    | OStr []   _ <- o = ONull
++    | OUrl t    _ <- o = if null (fst t) then ONull else o
++    | otherwise        = o
+ 
+ addDelim :: String -> [Output] -> [Output]
+ addDelim d = foldr (\x xs -> if length xs < 1 then x : xs else check x xs) []
+diff -rN -u old-citeproc-hs/src/Text/CSL/Eval.hs new-citeproc-hs/src/Text/CSL/Eval.hs
+--- old-citeproc-hs/src/Text/CSL/Eval.hs	2013-01-22 22:19:52.093825923 -0300
++++ new-citeproc-hs/src/Text/CSL/Eval.hs	2013-01-22 22:19:52.120493193 -0300
+@@ -25,6 +25,7 @@
+ import Control.Applicative ( (<$>) )
+ import Control.Monad.State
+ import Data.Char
++import Data.List
+ import qualified Data.Map as M
+ import Data.Maybe
+ 
+@@ -153,7 +154,12 @@
+                              "title"       -> formatTitle f fm
+                              "locator"     -> getLocVar >>= formatRange fm . snd
+                              "url"         -> getStringVar "url" >>= \k ->
+-                                              if null k then return [] else return [OUrl k fm]
++                                              if null k then return [] else return [OUrl (k,k) fm]
++                             "doi"         -> getStringVar "doi" >>= \d ->
++                                              if "doi:" `isPrefixOf` d
++                                                 then let d' = drop 4 d in
++                                                      return [OUrl ("http://dx.doi.org/" ++ d', d') fm]
++                                                 else return [OStr d  fm]
+                              _             -> gets (env >>> options &&& abbrevs) >>= \(opts,as) ->
+                                               getVar [] (getFormattedValue opts as f fm s) s >>= \r ->
+                                               consumeVariable s >> return r
+diff -rN -u old-citeproc-hs/src/Text/CSL/Input/Json.hs new-citeproc-hs/src/Text/CSL/Input/Json.hs
+--- old-citeproc-hs/src/Text/CSL/Input/Json.hs	2013-01-22 22:19:52.100492747 -0300
++++ new-citeproc-hs/src/Text/CSL/Input/Json.hs	2013-01-22 22:19:52.123826603 -0300
+@@ -106,6 +106,7 @@
+     , JSObject js <- j = (camel s      , JSArray (editDate $ fromJSObject js))
+     | "family"    <- s = ("familyName" , j)
+     | "suffix"    <- s = ("nameSuffix" , j)
++    | "URL"       <- s = ("url"        , j)
+     | "edition"   <- s = ("edition"    , toString j)
+     | "volume"    <- s = ("volume"     , toString j)
+     | "issue"     <- s = ("issue"      , toString j)
+@@ -122,7 +123,7 @@
+       camel x
+           | '-':y:ys <- x = toUpper y : camel ys
+           | '_':y:ys <- x = toUpper y : camel ys
+-          |     y:ys <- x = toLower y : camel ys
++          |     y:ys <- x =         y : camel ys
+           | otherwise     = []
+ 
+       format (x:xs) = toUpper x : xs
+diff -rN -u old-citeproc-hs/src/Text/CSL/Output/Pandoc.hs new-citeproc-hs/src/Text/CSL/Output/Pandoc.hs
+--- old-citeproc-hs/src/Text/CSL/Output/Pandoc.hs	2013-01-22 22:19:52.100492747 -0300
++++ new-citeproc-hs/src/Text/CSL/Output/Pandoc.hs	2013-01-22 22:19:52.123826603 -0300
+@@ -60,7 +60,7 @@
+     | FS str fm    <- fo = toPandoc fm $ toStr str
+     | FN str fm    <- fo = toPandoc fm $ toStr $ rmZeros str
+     | FO     fm xs <- fo = toPandoc fm $ rest xs
+-    | FUrl u fm    <- fo = toPandoc fm [Link (toStr u) (u,u)]
++    | FUrl u fm    <- fo = toPandoc fm [Link (toStr $ snd u) u]
+     | otherwise = []
+     where
+       addSuffix f i
+@@ -176,8 +176,10 @@
+     | Quoted t inls <- i
+     , b         = case headInline is of
+                     [x] -> if isPunctuation x
+-                           then Quoted t (reverseQuoted t inls ++ [Str [x]]) : clean' s b (tailInline is)
+-                           else Quoted t (reverseQuoted t inls             ) : clean' s b  is
++                           then if lastInline inls `elem` [".",",",";",":","!","?"]
++                                then Quoted t (reverseQuoted t inls             ) : clean' s b (tailInline is)
++                                else Quoted t (reverseQuoted t inls ++ [Str [x]]) : clean' s b (tailInline is)
++                           else Quoted t (reverseQuoted t inls) : clean' s b  is
+                     _   -> Quoted t (reverseQuoted  t inls) : clean' s b is
+     | Quoted t inls <- i = Quoted t (reverseQuoted  t inls) : clean' s b is
+     | otherwise = if lastInline [i] == headInline is && isPunct
+@@ -232,7 +234,7 @@
+ startWithPunct = and . map (`elem` ".,;:!?") . headInline
+ 
+ convertQuoted :: Style -> [Inline] -> [Inline]
+-convertQuoted s = proc convertQuoted'
++convertQuoted s = convertQuoted'
+     where
+       locale = let l = styleLocale s in case l of [x] -> x; _   -> Locale [] [] [] [] []
+       getQuote  x y = entityToChar . fst . fromMaybe (x,[]) . lookup (y,Long) . localeTermMap $ locale
+diff -rN -u old-citeproc-hs/src/Text/CSL/Parser.hs new-citeproc-hs/src/Text/CSL/Parser.hs
+--- old-citeproc-hs/src/Text/CSL/Parser.hs	2013-01-22 22:19:52.103826157 -0300
++++ new-citeproc-hs/src/Text/CSL/Parser.hs	2013-01-22 22:19:52.120493193 -0300
+@@ -23,7 +23,6 @@
+ #ifdef EMBED_DATA_FILES
+ import Data.FileEmbed
+ import qualified Data.ByteString as S
+-import Data.ByteString.UTF8 ( toString )
+ #else
+ import Paths_citeproc_hs ( getDataFileName )
+ import System.Directory  ( doesFileExist   )
+@@ -69,7 +68,7 @@
+   return s { styleLocale = mergeLocales (styleDefaultLocale s) l (styleLocale s)}
+ 
+ #ifdef EMBED_DATA_FILES
+-localeFiles :: [(FilePath, L.ByteString)]
++localeFiles :: [(FilePath, S.ByteString)]
+ localeFiles = $(embedDir "locales/")
+ #endif
+ 
+@@ -86,7 +85,7 @@
+             | otherwise     -> case lookup ("locales-" ++ take 5 x ++ ".xml") localeFiles of
+                                  Just x' -> return x'
+                                  _       -> error "could not load the locale file"
+-  return $ readXmlString xpLocale f
++  return $ readXmlString xpLocale $ L.fromChunks [f]
+ #else
+   f <- case s of
+          x | length x == 2 -> getDataFileName ("locales/locales-" ++
+diff -rN -u old-citeproc-hs/src/Text/CSL/Style.hs new-citeproc-hs/src/Text/CSL/Style.hs
+--- old-citeproc-hs/src/Text/CSL/Style.hs	2013-01-22 22:19:52.093825923 -0300
++++ new-citeproc-hs/src/Text/CSL/Style.hs	2013-01-22 22:19:52.120493193 -0300
+@@ -20,7 +20,7 @@
+                      , everywhere', everything, mkT, mkQ)
+ import qualified Data.Map as M
+ import Text.JSON
+-import Text.Pandoc.Definition ( Inline )
++import Text.Pandoc.Definition ( Inline, Target )
+ 
+ -- | The representation of a parsed CSL style.
+ data Style
+@@ -309,8 +309,8 @@
+     = FO          Formatting [FormattedOutput]          -- ^ List of 'FormatOutput' items
+     | FN   String Formatting                            -- ^ Formatted number
+     | FS   String Formatting                            -- ^ Formatted string
+-    | FUrl String Formatting                            -- ^ Formatted uniform resource locator (URL)
+     | FDel String                                       -- ^ Delimeter string
++    | FUrl Target Formatting                            -- ^ Formatted URL
+     | FPan [Inline]                                     -- ^ Pandoc inline elements
+     | FNull                                             -- ^ Null formatting item
+       deriving ( Eq, Show )
+@@ -331,7 +331,7 @@
+     | OContrib String    String   [Output] [Output] [[Output]] -- ^ The citation key, the role (author, editor, etc.), the contributor(s),
+                                                         -- the output needed for year suf. disambiguation, and everything used for
+                                                         -- name disambiguation.
+-    | OUrl    String              Formatting            -- ^ A uniform resource locator (URL)
++    | OUrl    Target              Formatting            -- ^ An URL
+     | OLoc    [Output]            Formatting            -- ^ The citation's locator
+     | Output  [Output]            Formatting            -- ^ Some nested 'Output'
+       deriving ( Eq, Ord, Show, Typeable, Data )
+diff -rN -u old-citeproc-hs/src/Text/CSL/Test.hs new-citeproc-hs/src/Text/CSL/Test.hs
+--- old-citeproc-hs/src/Text/CSL/Test.hs	2013-01-22 22:19:52.103826157 -0300
++++ new-citeproc-hs/src/Text/CSL/Test.hs	2013-01-22 22:19:52.120493193 -0300
+@@ -45,7 +45,8 @@
+ import Text.CSL.Style
+ import Text.Pandoc.Definition
+ #ifdef EMBED_DATA_FILES
+-import Data.ByteString.UTF8 ( toString )
++import qualified Data.ByteString.Lazy as L
++import qualified Data.ByteString.UTF8 as U
+ import Text.CSL.Parser ( localeFiles )
+ #else
+ import System.IO.Unsafe
+@@ -217,7 +218,7 @@
+                    | otherwise     -> take 5 x
+ #ifdef EMBED_DATA_FILES
+   ls <- case lookup ("locales-" ++ locale ++ ".xml") localeFiles of
+-          Just x' -> return $ readXmlString xpLocale (toString x')
++          Just x' -> return $ readXmlString xpLocale $ L.fromChunks [x']
+           _       -> return $ Locale [] [] [] [] []
+ #else
+   ls' <- getCachedLocale locale
+diff -rN -u old-citeproc-hs/test/createTest.hs new-citeproc-hs/test/createTest.hs
+--- old-citeproc-hs/test/createTest.hs	1969-12-31 21:00:00.000000000 -0300
++++ new-citeproc-hs/test/createTest.hs	2013-01-22 22:19:52.123826603 -0300
+@@ -0,0 +1,37 @@
++import System.Environment
++import Text.CSL
++import Text.CSL.Test
++import Text.JSON.Generic
++
++main :: IO ()
++main = do
++  args <- getArgs
++  case args of
++    [c,r] -> readStruff c r [] >>= putStrLn
++    _ -> error "usage:    kljlkjljlkjlkjl"
++
++readStruff :: String -> String -> String -> IO String
++readStruff c r s = do
++  c' <- readFile c
++  r' <- readBiblioFile r
++  return $ mode "citation" ++ result [] ++ citationItems r' ++ csl c' ++ input r'
++
++mode :: String -> String
++mode s = ">>===== MODE =====>>\n" ++ s ++ "\n<<===== MODE =====<<\n\n"
++
++result :: String -> String
++result s = ">>===== RESULT =====>>\n" ++ s ++ "\n<<===== RESULT =====<<\n\n"
++
++citationItems :: [Reference] -> String
++citationItems l = ">>===== CITATION-ITEMS =====>>\n[\n    [\n" ++ toId ++
++                  "\n    ]\n]\n<<===== CITATION-ITEMS =====<<\n\n"
++    where
++      toId = foldr addComma [] toStringList
++      addComma x xs = if length xs < 1 then x ++ xs else x ++ ",\n" ++ xs
++      toStringList = flip map l $ \x -> "        {\n            \"id\": \"" ++ refId x ++ "\"\n        }"
++
++csl :: String -> String
++csl s = ">>===== CSL =====>>\n" ++ s ++ "<<===== CSL =====<<\n\n"
++
++input :: [Reference] -> String
++input s = ">>===== INPUT =====>>\n" ++ encodeJSON s ++ "\n<<===== INPUT =====<<\n\n"
+\ No newline at end of file
diff --git a/social/opentracker/PKGBUILD b/social/opentracker/PKGBUILD
index 2826a21ef..5ecf00b3a 100644
--- a/social/opentracker/PKGBUILD
+++ b/social/opentracker/PKGBUILD
@@ -2,21 +2,18 @@
 # Maintainer: Jonas Heinrich <onny@project-insanity.org>
 
 pkgname=opentracker
-pkgver=20120911
-pkgrel=2
+pkgver=20130126
+pkgrel=1
 pkgdesc='An open and free bittorrent tracker (open mode)'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://erdgeist.org/arts/software/opentracker/'
 license=('custom:Beer' 'GPL')
 makedepends=('libowfat' 'cvs')
 depends=('bash' 'zlib')
 backup=('etc/opentracker/config')
-source=('opentracker.rc'
+source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"{,.sig}
 'opentracker.service'
 'license.txt')
-md5sums=('390bde9d010e79ab1309c02dcf9972e8'
-'3c638b71d5ecb65fb7964796975b2078'
-'865211941e882c0aff5d36a22ac9efaa')
 
 _cvsroot=':pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot'
 _cvsmod='opentracker'
@@ -60,11 +57,11 @@ package(){
 	install -D -m 644 opentracker.conf.sample $pkgdir/etc/opentracker/config
 	install -D -m 644 $srcdir/license.txt $pkgdir/usr/share/licenses/opentracker/license.txt
 
-  # create /etc/rc.d/opentracker
-  mkdir -p "$pkgdir/etc/rc.d/"
-  install -m 755 "$srcdir/opentracker.rc" "$pkgdir/etc/rc.d/opentracker"
-
   # Create opentracker service
   mkdir -p "$pkgdir/usr/lib/systemd/system/"
   install -m 644 "$srcdir/opentracker.service" "$pkgdir/usr/lib/systemd/system/"
 }
+md5sums=('702a05fc2c205c6367a7e95334d8e152'
+         '3c80785c33c97dffe6f119417865a309'
+         '3c638b71d5ecb65fb7964796975b2078'
+         '865211941e882c0aff5d36a22ac9efaa')
diff --git a/social/opentracker/opentracker.service b/social/opentracker/opentracker.service
new file mode 100644
index 000000000..5f1b887ea
--- /dev/null
+++ b/social/opentracker/opentracker.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=OpenTracker Daemon
+After=network.target
+
+[Service]
+User=nobody
+ExecStart=/usr/bin/opentracker -f /etc/opentracker/config
+ExecStop=/bin/kill -INT $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/~emulatorman/iceape-l10n/.gitignore b/~emulatorman/iceape-l10n/.gitignore
deleted file mode 100644
index 3e1eb57b5..000000000
--- a/~emulatorman/iceape-l10n/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-PKGBUILD.list
-langpacks.txt
-*.diff.gz
diff --git a/~emulatorman/iceape-l10n/PKGBUILD b/~emulatorman/iceape-l10n/PKGBUILD
index 1170df1d5..be0a6dd07 100644
--- a/~emulatorman/iceape-l10n/PKGBUILD
+++ b/~emulatorman/iceape-l10n/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
@@ -11,7 +11,7 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceape
-_debver=2.7.11
+_debver=2.7.12
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,6 @@ pkgbase=iceape-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=2.7.11
 pkgver=${_debver}.${_debrel}
 pkgrel=1
 
@@ -31,13 +30,15 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/source/sid/iceape"
 license=('MPL')
 depends=("iceape-libre>=$pkgver")
-  
-source=()
+makedepends=('unzip' 'zip')
+source=('region.properties')
 for lang in ${_langpacks[@]}
 do
     source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
 done
 
+_path="/usr/lib/iceape/extensions"
+
 build() {
   cd "${srcdir}"
   for f in *.deb
@@ -45,10 +46,21 @@ build() {
       bsdtar xf $f
       bsdtar xf data.tar.gz
   done
-}
 
-_path="/usr/lib/iceape/extensions"
+  cd $srcdir/$_path
 
+  for i in ${_langpacks[@]}
+  do
+    cd $srcdir/$_path
+    unzip -q langpack-$i@iceape.mozilla.org.xpi -d $i
+    rm langpack-$i@iceape.mozilla.org.xpi
+    install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
+    cd $i
+    zip -q -r $srcdir/$_path/langpack-$i@iceape.mozilla.org.xpi .
+  done
+
+  cd $srcdir
+}
 
 for lang in ${_langpacks[@]}
 do
@@ -62,26 +74,27 @@ package_iceape-l10n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('fb27360aff6250e7d483803583a5cd78'
-         '236c7aacd7e6416a37aff95f7bfa6a80'
-         'f17d76128ab529415078cafe63b61d50'
-         '07a5c72158427db8c5a990be6eb2d036'
-         'fddbcf27d00f1f4d92fed197ace8dd1b'
-         '96eb3291200c44ffdc3ab1d1446f00b7'
-         '04dec3bee388ae66cd434342ab03074f'
-         'bdef8b38501e7d6805b5304ef2bf8425'
-         '90b5d0ab0ab2eb3b75e5f80cb6d289bb'
-         '97f940c39b84a90b0e16eaeca4fa7806'
-         '34644b44381ae1da46f2fa308fd1cf34'
-         'a6240664344798568276dd5dbdd27fb2'
-         '61aedef6a89b400584dde82b5e97ff0f'
-         'abe7a9172876b30c4677b1f4c2237fc9'
-         '60f3c543fbdb72cc12aef8f2369101ff'
-         'c002da281c0d0fa357f92edd2b8cd12c'
-         'c17ab30f25f05024879afdf85fa4c516'
-         '250a08a999d6d1d6086ffbd17d60fbb4'
-         '609ce8793ea0d5465da7195e4d956fef'
-         '060226599bac5bc8ddb64417ef1a0108'
-         'eaa827909690bfa8dfdc621164e23ca8'
-         '3fb66893b5ea3b959de48ef16fb26c74'
-         '6f2d77e767efa0b0d4cb56df9ccd0a2f')
+md5sums=('428246ef3fb64103ff2cf5eaae2a92ca'
+         '22a14a6a2f03d0004a1fa990892094ef'
+         'af2379ea50672fe37ff8550d5c9e20a0'
+         'e5975c3b1ffaa5fcb3f5203cdfe8e0fb'
+         '21fcbd011acc382f5ec7a32aa04562ef'
+         '8fbf821c811c55514a100ae5d5e9e844'
+         'bd8f18e0d0f233e0a1c1a518537798a5'
+         '037cbb6fe0576f7f5bbbf956928f01e1'
+         '56964b577fcb077a9b81d07c59cc5af3'
+         'd2fb622717114a921efb37f028f31c6c'
+         '6abe2dbab7fcbdaf43e77290ca6853c9'
+         '558a2d29be749f6506f774703c58952f'
+         '7abdc6eb4154b88509a6c4f119c943a7'
+         '5a4fad9c23c8d19833ac5c76ad9aca4a'
+         '8d45110acc90f388923f01fb9cfca947'
+         'd1acbe2ef1120e70d5365476aa8679f9'
+         '604de00ea6ee06565212804b0d499df3'
+         'ceee78a29bd2f947558f04489ee50f54'
+         'afc6e343f0635a3ee5b7a22af947e8b8'
+         '455bab7a596cb43ac4ad80cb89a78b25'
+         '92a985b40aec8b3726ba22f45667994d'
+         'bc8c98f0518617ed2220fb3bfb03e165'
+         '449c91720751538f09ad3d555dbe2fce'
+         '8843be8937963d094d4272ac33019082')
diff --git a/~emulatorman/iceape-l10n/region.properties b/~emulatorman/iceape-l10n/region.properties
new file mode 100644
index 000000000..4399d8db7
--- /dev/null
+++ b/~emulatorman/iceape-l10n/region.properties
@@ -0,0 +1,32 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Default search engine
+browser.search.defaultenginename=DuckDuckGo HTML
+
+# Search engine order (order displayed in the search bar dropdown)s
+browser.search.order.1=DuckDuckGo HTML
+browser.search.order.2=DuckDuckGo Lite
+browser.search.order.3=Seeks Search
+
+# 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://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 
+# profile database.  Note that "new" is defined as "has a different URL"; this
+# means that it's not possible to update the name of existing handler, so 
+# don't make any spelling errors here.
+gecko.handlerService.defaultHandlersVersion=3
+
+# The default set of protocol handlers for irc:
+gecko.handlerService.schemes.irc.0.name=Freenode
+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
+
+# The default set of protocol handlers for ircs:
+gecko.handlerService.schemes.ircs.0.name=Freenode
+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
diff --git a/~emulatorman/iceape-libre/PKGBUILD b/~emulatorman/iceape-libre/PKGBUILD
index 2595a36f9..c46631628 100644
--- a/~emulatorman/iceape-libre/PKGBUILD
+++ b/~emulatorman/iceape-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Sid
 _debname=iceape
-_debver=2.7.11
+_debver=2.7.12
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,9 +11,9 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=1
 pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey."
-arch=('i586' 'i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
 makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-ply' 'librsvg' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
@@ -29,13 +29,13 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         ${_pkgname}-2.0-lang.patch
         clrf.patch
         libre.patch)
-md5sums=('40473b4c662975eda865e1fc35c4953b'
-         'f704b69cc0328c83edd6223420fbd412'
+md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908'
+         '1fb9c4affad5f030c4e3544aadeaeea2'
          '60ba9e8f2fafd20e41268af534a55ea7'
          '7266333e31731af8bb50c2eca8d0bd26'
          '25b6fe16ac24cd5c852213e5c1adb272'
          'c395d443a8c4c16880c7322bcf174743'
-         'ebe66195898c89644138ffc88ba26a24')
+         '3e0a275b57e5ccfeb7573e716693441a')
 
 build() {
   export QUILT_PATCHES=debian/patches
diff --git a/~emulatorman/iceape-libre/libre.patch b/~emulatorman/iceape-libre/libre.patch
index 6273a05a9..e316dbf4c 100644
--- a/~emulatorman/iceape-libre/libre.patch
+++ b/~emulatorman/iceape-libre/libre.patch
@@ -47,13 +47,13 @@
 -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/
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
  
  # The default set of protocol handlers for ircs:
 -gecko.handlerService.schemes.ircs.0.name=Mibbit
 -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
 +gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
 --- comm-release.orig/mozilla/modules/libpref/src/init/all.js	2012-03-16 04:46:09.000000000 -0300
 +++ comm-release/mozilla/modules/libpref/src/init/all.js	2012-05-12 04:03:52.163831535 -0300
 @@ -47,7 +47,7 @@
diff --git a/~emulatorman/icecat-l10n/.gitignore b/~emulatorman/icecat-l10n/.gitignore
deleted file mode 100644
index 3987fdafb..000000000
--- a/~emulatorman/icecat-l10n/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-index.html
-langpacks.txt
-*.xpi
diff --git a/~emulatorman/icecat-l10n/PKGBUILD b/~emulatorman/icecat-l10n/PKGBUILD
index 7ee93cf06..197e3e236 100644
--- a/~emulatorman/icecat-l10n/PKGBUILD
+++ b/~emulatorman/icecat-l10n/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
-# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
-
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 # Based on firefox-i18n package
 
 # When updating to a newer upstream release:
diff --git a/~emulatorman/icecat/PKGBUILD b/~emulatorman/icecat/PKGBUILD
index 5010b4298..c26b3c1b7 100644
--- a/~emulatorman/icecat/PKGBUILD
+++ b/~emulatorman/icecat/PKGBUILD
@@ -16,7 +16,7 @@
 _pgo=false
 pkgname=icecat
 pkgver=17.0.1
-pkgrel=2
+pkgrel=4
 pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
 arch=(i686 x86_64 mips64el)
 license=(GPL2 MPL LGPL)
@@ -79,11 +79,11 @@ md5sums=(
   a22327391a1995703436ed42fe703d3f
   ac29b01c189f20abae2f3eef1618ffc0
   3009b176cc5f9b1e416b1bf7c45b064b
-  f4cffe48e84283026da634424f4bbee6
-  e81ad01dbc16ba28bf92ba4b7c309ca7
-  d93fe402b87cd000a869e1fd6badc6c9
+  fcd2d895a0335c1b5fb652401e9da0d5
+  b41f82994fa056ffa5f8e6d99570e27a
+  b30ba2b5562558d510fdd09d626d0faa
   64826fcf48816b13090042eefddbaa58
-  0d053487907de4376d67d8f499c5502b
+  e7b54d4bd68b2af4cfdef074e3ed08a2
   #c8552d030494443218d88792f4dbbd0f
 )
 
@@ -139,7 +139,7 @@ package() {
   cd $srcdir/gnuzilla-build
   make -j1 -f client.mk DESTDIR=$pkgdir install
 
-  install -Dm644 $srcdir/vendor.js $pkgdir/usr/lib/$pkgname/defaults/pref
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js"
 
   brandingdir=browser/branding/unofficial
   icondir=$pkgdir/usr/share/icons/hicolor
diff --git a/~emulatorman/icecat/icecat-safe.desktop b/~emulatorman/icecat/icecat-safe.desktop
index 87acc970c..e33d75469 100644
--- a/~emulatorman/icecat/icecat-safe.desktop
+++ b/~emulatorman/icecat/icecat-safe.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=/usr/bin/icecat -safe-mode %u
+Exec=/usr/lib/icecat/icecat -safe-mode %u
 Icon=icecat
 Type=Application
 Terminal=false
diff --git a/~emulatorman/icecat/icecat.desktop b/~emulatorman/icecat/icecat.desktop
index 8a7cad93d..72666a5b8 100644
--- a/~emulatorman/icecat/icecat.desktop
+++ b/~emulatorman/icecat/icecat.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=/usr/bin/icecat %u
+Exec=/usr/lib/icecat/icecat %u
 Icon=icecat
 Type=Application
 Terminal=false
diff --git a/~emulatorman/icecat/libre.patch b/~emulatorman/icecat/libre.patch
index 497b8cd10..496c6b983 100644
--- a/~emulatorman/icecat/libre.patch
+++ b/~emulatorman/icecat/libre.patch
@@ -17,10 +17,18 @@ diff -urN a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
 --- a/browser/locales/en-US/chrome/browser-region/region.properties
 +++ b/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -10,23 +10,11 @@
- browser.search.order.2=Google
- browser.search.order.3=Yahoo
+@@ -3,30 +3,18 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
+ # Default search engine
+-browser.search.defaultenginename=DuckDuckGo
++browser.search.defaultenginename=DuckDuckGo HTML
+ 
+ # Search engine order (order displayed in the search bar dropdown)s
+-browser.search.order.1=DuckDuckGo
+-browser.search.order.2=Google
+-browser.search.order.3=Yahoo
+-
 -# This is the default set of web based feed handlers shown in the reader
 -# selection UI
 -browser.contentHandlers.types.0.title=Bloglines
@@ -32,7 +40,10 @@ diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
 -
 -# Keyword URL (for location bar searches)
 -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
--
++browser.search.order.1=DuckDuckGo HTML
++browser.search.order.2=DuckDuckGo Lite
++browser.search.order.3=Seeks Search
+ 
  # URL for site-specific search engines
  # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
  # to be searched and the user's search query. Place them in the appropriate location
diff --git a/~emulatorman/iceweasel-l10n/.gitignore b/~emulatorman/iceweasel-l10n/.gitignore
deleted file mode 100644
index 3e1eb57b5..000000000
--- a/~emulatorman/iceweasel-l10n/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-PKGBUILD.list
-langpacks.txt
-*.diff.gz
diff --git a/~emulatorman/iceweasel-l10n/PKGBUILD b/~emulatorman/iceweasel-l10n/PKGBUILD
index b2b937601..8e0172208 100644
--- a/~emulatorman/iceweasel-l10n/PKGBUILD
+++ b/~emulatorman/iceweasel-l10n/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
-# Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
@@ -11,7 +11,7 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=18.0
+_debver=18.0.1
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,9 +22,8 @@ pkgbase=iceweasel-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=18.0
 pkgver=$_debver.$_debrel
-pkgrel=5
+pkgrel=1
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
@@ -76,91 +75,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
 done
 
 md5sums=('428246ef3fb64103ff2cf5eaae2a92ca'
-         '08556c8d27a4313b5e67e655d2e1e828'
-         '9fa01f43db09b12cd724f94c28883a9e'
-         '0d1ef852709fcae1842105d675c22312'
-         '56247c867b52a19808ca72f7fceb349a'
-         'dd670bcc609c06139671bf953f26d7b8'
-         'df233884b68c8f37ff9b757b6480ae94'
-         'd2aa803c6e1d1ebbaf9d4f6ad73f2aa8'
-         'd0f512e8bf97110a60b16de59b15869b'
-         '54045555373497393ded8bccc0dc1784'
-         '61cb757a64268141518ed9dad4795106'
-         '62f338f7bcd7fb50ef2f61936c0e4990'
-         '97b2c6a0de5d60b4e5696973aedd3cfc'
-         'd916a0b470264a9271509ed7a109e360'
-         '6f442a2989b814f20f4b73975bc97a5c'
-         '6117d8d24dad056f143feb3e061702dd'
-         'c759f731a415f99a73e20090f4893184'
-         'b481b08da143ff45a84d32285249fcfd'
-         '828f9a5b69634b39d48bfdf472a957bd'
-         '12d4b6779cb50777303381d35f539c4c'
-         '8609fd343e1e91724f50d6833d3e2f82'
-         '331acfbad62badfd48713d9b461efcf3'
-         '49216a2ea50fcd01057bd7b0d14a78e2'
-         'b0738cf3f5ce546134150e082cffaf61'
-         '9f03cd24990c897e75594229517c1e9a'
-         '5667260492203f29bba1b2732ce20b77'
-         'a1dd5872ab73a1a14ce3e285138445da'
-         '03e82d09ba4026ab10df5cfc3b78ca5f'
-         '1e92e7b3725cdfa94fc705ab54c7c6aa'
-         '35d9a0ccfa3c95a3a56f29c7a5bc4e6b'
-         '656dbfb6ac9efbeb4e58b5b9fc5fda03'
-         '29a343077a3de07ce9bb3e4d24d6a11a'
-         '831e09a24d4d40cb1bb45f980b7fa251'
-         '8488c98293d6f16caf99cf556f999611'
-         '92b07db5dcb8fc95ac8f5706b94d7ed5'
-         'fa9ee1b85adbd15c46ca075d94e62a14'
-         '19383d5cb3ed6de8599118dd9f54889e'
-         'fdff305ce5b154b12907fa302419548c'
-         '24df7d71f1a70e8225e80d15a53d3777'
-         '793bfd1301c4e989e2f904ad9f6b3adc'
-         '06d4e4423df0908254e422d207292858'
-         'd53dce3f9b3a5de374dd6c10ebe3665c'
-         '382e5237a81fbbbaab499c5c6646b308'
-         '1da9f5ce8cbd3bdcc46f932b7458574f'
-         'd635c40c88a7430a2103c13cdf1b58d3'
-         'd1eac26314ade41883b24b91cd9e01c6'
-         '6e65dd6b8cb0fbd4395e548926043e70'
-         '97e8c9b3db047651a38f29366867c92e'
-         '87433742c0b21c7655988d5586667d77'
-         'ac5cab1c45e0accf718cf624c8545dea'
-         'd3f2ff9a817dff71fa05ffe5f3f45db8'
-         'd1909b644b4495343b6d041c15683ad2'
-         '5c79b17dd9d0d83f749f52d489b347a7'
-         '433f0456e52420955a3689d2b18b7a94'
-         '90ee54b793a100b74f1b91ca2acb103b'
-         '0544d0e7e26a0c07379f0c6ca22708d8'
-         'c75d55a574f525f5f08574cb01a2ee20'
-         'b43589a4b08112996c756db467015eab'
-         '82782fd09a815441622187ed8839b0ee'
-         '52de8e6386f0232d13c6768092089c23'
-         '091e065f1723fa7fa7701ced828e24ed'
-         'a036b50e5915e5b37257fa048e8d7a60'
-         '1037213a49539a069b9e223dacfbdc94'
-         '251b43c207b4fb0842a913e658f868c3'
-         '1aac06560c3a0957087eab1d2034eba3'
-         '964b3edfd3221d8e412ef695bd9a7b00'
-         '45a900da3f1cc4834b32b190c67c42af'
-         'cad9df2808fd8f009d27142a729f21d6'
-         '192eaff8883db984c42ee43e3a5303f4'
-         '1000e395379bc6ef3b9c2c891f615e44'
-         '1da3d8777bc0595dea09fdd7222b55f3'
-         '0fbdd7294e21936ae75aca56d4d7252c'
-         'af481ef78e4ffe7b4cbf892c5cb10cc2'
-         'fc884a9a8203c56196993f6ed65069ca'
-         '1bebdd6e194cbb746f81725e317eb9b4'
-         '4c75d146f27aa2a70b0219954baa8965'
-         'd832ceafecac23a0659f7a766f6d98de'
-         'ed056fa5b30ddf55042699713c629503'
-         '8e698f20270de2b2fbaf9c1f09257c06'
-         'e864caf42db46efbaa229f36af572ee4'
-         '013864da4a811e894ba1605e7f93e80e'
-         '69be7804b3d6a6bb5683554cbc324bed'
-         'efc6a8427f080706d7d590a7b0eacadd'
-         '40c41e04514e3cbcae33b15a062b3811'
-         '164850087cdf79d57569ee9d4e1a8d2d'
-         '226de7be23de61db7df718ef93f7c906'
-         'fb331d7fd4f1c853192111663e2672a0'
-         '5dd0a89e43aa0f263fc7c1d4302dbfd6'
-         '8e602db8304ddafad17fd8098125d37b')
+         '5bff9acef5bdfd10fff5e3f36ff7c8bc'
+         '5ada703cfdc40e32c5c145380e979e1a'
+         'e8b198ad4673ef12538f17e73529f9f8'
+         'ba77a8937f6d0bc84ad789950ef42c70'
+         'd940e1ccb7f501555500b17f5ea28e74'
+         '7325a84d999c3ea5f884cff15e1a4210'
+         'f35c32e53f07774efa39bec386aa35c6'
+         '2d2a628958c5ad0f66077ae1703f61ba'
+         '458c5cee205f12ced09f8baab1605e11'
+         '7271c461eb02608d193208c5da94280e'
+         'a505e69bf7cbb4caadcd5dfa67da1b78'
+         '0b0e10b39d115aedc1dfc0967068df95'
+         '09153faa23ca0a953aa22cc3989eba5e'
+         'da9779d4a64f1bbab1195c9801fb678c'
+         '1815468f85d1eea9f018a72bb83889d3'
+         '6103d52fb61b4bb7e921870ff05c98af'
+         'c3f0e46e2cfb68bf30363c92dcd9934d'
+         '5214d31f5cd5c077f09a0c275f936c25'
+         'ad4f664710dfa896b969f25b824d7086'
+         'ba2339dce1b84f0e7c0b77331572d6f5'
+         '28fb3e3e873cf5d03207e220eebf2ab0'
+         'a6f6ea487f6577ddf4cb2ef10ed5e401'
+         '8143ba212c6ef5f1dfc311ce84861450'
+         '5a6db78ee5cd6b41c02b7f65e666a045'
+         '63869ca68431ee4c7d3769f4ef8b68e1'
+         '5e87285fa518d1a95a7a63a2587497b7'
+         '969c213166c8ecd7cc752c557a1c056d'
+         '0c47f76ca2fb3d747be170fd61fa36cb'
+         '01f67291435616996e968f41259b91bd'
+         'f785b30e48ea4ee4af286325b020c545'
+         '58684c98cfc9d35d3d37f827268e72ac'
+         '2ec870106c72d0772f65f6a129547cb1'
+         '98d5cec52877790042830e8be41db1ca'
+         '654ee0ebb10cfbfe9b8b6540548f08e7'
+         '5a60a9cd96e0900a6cfbf37f7a68b715'
+         'e6e276eb4b8b7c1eb5a3593b07b9a84a'
+         '0c788fece8760fb61509c0fe1ac7eff4'
+         '98cba049bae024ae7dc7426f6adf09d2'
+         '2d37f79f57d38008e64c9a52a05c91a4'
+         'aeffb314945de717ef8a417653bcba3d'
+         '910b595a09b98f4eae1f4e6ddcae6ad5'
+         '9c5babdcd0ecbac8e487bed05cf5fe1a'
+         'f94018f378dcd11d8d63ebbd4a595ca1'
+         'bb4cc3cdb7995333babe6462d1aaef06'
+         '7a3d8e89625858fea797f33e7a426c25'
+         'd1fbf396db41d77da0b3f9f2528c8c96'
+         'cfa20a918d3adad42313fc2db86c63b8'
+         'fa213ce6abfa19a6067e64c149e90b27'
+         '8c2a0ec2e38504c6f4657d9f00c3b4f0'
+         '3ff17d0759b40c4d308b8f28b698dba1'
+         '2fc7cc5a0d2d0794c7f08156fd65619d'
+         'ed57c5f168e53cec827695ac4c18ec10'
+         'c8b05f70068e8a8255d8f28f3171df5f'
+         'adc1d1e78c6c42624b1e312be7dec90c'
+         '1f667156cd0b9e23effcbf8e26d01839'
+         'dd112d0dbbcc45b38036694e5c82a6aa'
+         'f37be06f19a3e6e60727466896bc6b65'
+         'ec947261ee12d58c1a9998ea8136f744'
+         'a3434e5da7b65559de7c4adcb14906d3'
+         'b8984e5ab770cd3f0fd70cbc33ba1150'
+         'a06634264be552d2e64189a761c7cc3c'
+         '417246fb8b66c806bdb903801f975627'
+         'b9e367b2d4f96ea111ae46c22801b0bf'
+         '0a245b319c1dc40ef95a24ca5b0fca9d'
+         '7a08d4e4d7a10f12a4d79fe96e2c1f51'
+         'f4d71f4e0a1794ccc25463cced9457d4'
+         '778089e056b6e8b1aaef1a4769153059'
+         'c3855b0c99342acddca0a7e6d9dc126f'
+         '9bbd6dbf2df859fcbbf366e753dfcdd6'
+         '338ea8d0681d2df2409a2398c3ae3694'
+         'e783a6e96d080413a60d1200fa0ac8a7'
+         'd1af3e947fc8a8aca39bec88aaeda708'
+         'e53c6a92a5533a706abb6abbe761508e'
+         '5d139a83f2b5e1625142f06a63147a28'
+         'd671a0fd8a4f8eb08d4b9ab52372d667'
+         'af9bf9f8a04dc898fad49083824fea6a'
+         '78184aa445a574ed6f57e926c7ab25c4'
+         '62f54d64f86204a45fc12557a4a76eb0'
+         '0ee43e97979aff7b7e2bb3d9e42a6e00'
+         '6fe3c2ed768593d942461f462fadd508'
+         '469ff3256c7322f15a71e0fd81e09f57'
+         '74bb076c39c409d9c795722d692561dc'
+         'fc439b2e9dfff5111d0fea9fdeef30de'
+         '546c8cac927262e9166e01f4634a22cb'
+         '1009936f51fad91899c6f0144040f174'
+         '700322fdfe534fa47579895c87a93808'
+         'fbdd5acbff2ef4d73665766d1f0cd815'
+         'b3cc9c95ce6146453c8929213b04d9fe')
diff --git a/~emulatorman/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/~emulatorman/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index 69fe5c072..f59454192 100644
--- a/~emulatorman/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/~emulatorman/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -67,7 +67,7 @@ index d7fec75..d531b83 100644
  component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
  contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
 diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index a6598fe..8f83da8 100644
+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", {
@@ -78,12 +78,12 @@ index a6598fe..8f83da8 100644
 +FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
  FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
  
- const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
+ this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
 diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
-index 0669aa8..19552e3 100644
+index 1f60879..fc83a99 100644
 --- a/browser/components/migration/src/MigrationUtils.jsm
 +++ b/browser/components/migration/src/MigrationUtils.jsm
-@@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({
+@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({
     * @see nsIStringBundle
     */
    getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
@@ -95,7 +95,7 @@ index 0669aa8..19552e3 100644
      if (aReplacements === undefined)
        return getMigrationBundle().GetStringFromName(aKey);
      return getMigrationBundle().formatStringFromName(
-@@ -622,6 +617,17 @@ let MigrationUtils = Object.freeze({
+@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({
    },
  
    /**
@@ -114,7 +114,7 @@ index 0669aa8..19552e3 100644
     */
    finishMigration: function MU_finishMigration() {
 diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
-index 744f117..59e5a4c 100644
+index f67823b..36016b8 100644
 --- a/browser/components/migration/src/ProfileMigrator.js
 +++ b/browser/components/migration/src/ProfileMigrator.js
 @@ -12,6 +12,7 @@ function ProfileMigrator() {
@@ -184,10 +184,10 @@ index 260bc29..52b32cc 100644
 -64_firefox=Bookmarks Backups
 +64_self=Bookmarks Backups
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 339ffda..6999b26 100644
+index 687c8d8..203d8cf 100644
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -38,7 +38,7 @@ toolkit.jar:
+@@ -39,7 +39,7 @@ toolkit.jar:
  +  content/global/mozilla.xhtml               (mozilla.xhtml)
     content/global/nsDragAndDrop.js            (nsDragAndDrop.js)
     content/global/resetProfile.css            (resetProfile.css)
@@ -267,7 +267,7 @@ index f35c227..7062886 100644
  
  %{C++
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 68a52e6..02bb30e 100644
+index e3dd0df..ef7bb74 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
 @@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
diff --git a/~emulatorman/iceweasel-libre/PKGBUILD b/~emulatorman/iceweasel-libre/PKGBUILD
index fca35cc42..4f7d77337 100644
--- a/~emulatorman/iceweasel-libre/PKGBUILD
+++ b/~emulatorman/iceweasel-libre/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=false
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=18.0
+_debver=18.0.1
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=$_debver.$_debrel
-pkgrel=5
+pkgrel=1
 
 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
 if $_pgo; then
@@ -52,21 +52,19 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel-install-dir.patch
         vendor.js
         shared-libs.patch
-        bug677092.patch
         replace-urls.txt
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
-         '6a571d3a3b355c331f67d57702f4fccf'
+md5sums=('5d481dd35a304702d1f311eeb3f1149f'
+         '6a4781e8ddc1b166f36930c4864e095f'
          '619e8f7c8596838a7daf2b7ce2e54cd3'
          'ac29b01c189f20abae2f3eef1618ffc0'
          '1ee2d4bcacee73d671b9ffa17a02abaa'
-         '2823e0ecdefc16b590a9997f9228924a'
+         '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '6dd547c72bb875a3101135a1c32d4783'
          '52e52f840a49eb1d14be1c0065b03a93'
-         '23520aca140fb0dd3e1b6f21b21f591f'
          'a8fc4658d45b6bf9350023e5c3f34e56'
-         '65f68090d2a69b467bd2707d0c4ea3bd')
+         '46a4b19b414065b99b870ea79b454f6e')
 
 if [ "$_pkgname" != "$pkgname" ]; then
   provides+=("$_pkgname=$pkgver")
@@ -100,11 +98,7 @@ build() {
   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"
-  
-  # 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
-  
+
   # Replace common URLs
   sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
     if [[ -n $moz_url ]]; then
@@ -115,12 +109,12 @@ build() {
         | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
     fi
   done
-  
+
   # Patch anything that's left
   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
diff --git a/~emulatorman/iceweasel-libre/iceweasel.desktop b/~emulatorman/iceweasel-libre/iceweasel.desktop
index e1aa6f0ca..c4a338cc6 100644
--- a/~emulatorman/iceweasel-libre/iceweasel.desktop
+++ b/~emulatorman/iceweasel-libre/iceweasel.desktop
@@ -94,7 +94,7 @@ 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=iceweasel %u
+Exec=/usr/lib/iceweasel/iceweasel %u
 Terminal=false
 X-MultipleArgs=false
 Type=Application
author	Márcio Alexandre Silva Delgado <coadde@lavabit.com>	2013-01-27 11:49:47 -0200
committer	Márcio Alexandre Silva Delgado <coadde@lavabit.com>	2013-01-27 11:49:47 -0200
commit	387a6ac962ce6a21ccb27fa2cc494ea6e3d2b8cd (patch)
tree	e0ac407d773af321071153aa5c0138235cc1f25e
parent	b6fba38485fbddb58ea021c9b532e7fea84404b1 (diff)
parent	a98a7931923d702e17d7db3de4dd40cdcfb26885 (diff)