21 files changed, 283 insertions, 766 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 2800d9147..396706459 100755
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-spacenav=true
+spacenav=false
 pkgbase=blender-libre
 pkgflag=-libre
 if [ $spacenav == true ]; then
@@ -17,7 +17,7 @@ else
 fi
 pkgdesc="A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
 pkgver=2.64a
-pkgrel=2
+pkgrel=3
 pkgaev=5
 arch=(
   i686
@@ -118,9 +118,9 @@ optdepends=(
 )
 makedepends=(
   # make dependencies tree (root) #
-  mesa
   boost
   cmake
+  mesa
   subversion
 )
 provides=(
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index c7f952833..3270a3d4d 100755
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -1,33 +1,29 @@
-# Maintainer: André Silva <andre.paulista@adinet.com.uy>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 
+_pkgname=ghostscript
 pkgname=gnu-ghostscript
-_pkgver=9.04
-pkgver=9.04.1
+_pkgver=9.05
+pkgver=9.05.0
 pkgrel=1
-pkgdesc="An interpreter for the PostScript language from FSF"
+pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers"
 arch=('i686' 'x86_64')
 license=('GPL3')
-depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms2')
 makedepends=('gtk2' 'gnutls')
 optdepends=('texlive-core:      needed for dvipdf'
             'gtk2:              needed for gsx')
-conflicts=('ghostscript')
-replaces=('ghostscript-lrpng' 'ghostscript')
-provides=('ghostscript-lprng' "ghostscript=$pkgver")
-url="https://www.gnu.org/software/ghostscript/"
-source=(ftp://ftp.gnu.org/gnu/ghostscript/${pkgname}-${pkgver}.tar.xz
-	${pkgname}-cups-rgbw.patch
-	libtool.patch)
+conflicts=${_pkgname}
+replaces=${_pkgname}
+provides="${_pkgname}=9.06"
+url="https://www.gnu.org/software/${_pkgname}/"
+source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz
+        libtool.patch)
 options=('!libtool' '!makeflags')
-md5sums=('aba639a5102afbd2ee30c67831692c27'
-         '5a78af559d44a7502978fd09f840e3aa'
+md5sums=('e80423be9abb32fc99cc897ed379a7df'
          '5bd5d4966007b460deed866a30a0b3c8')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  
-  # fix broken color printing https://bugs.archlinux.org/task/25519
-  patch -Np1 -i ${srcdir}/${pkgname}-cups-rgbw.patch
 
   # fix libtool version
   patch -Np1 -i ${srcdir}/libtool.patch
@@ -35,7 +31,7 @@ build() {
   # force it to use system-libs
   rm -rf jpeg libpng zlib jasper expat tiff lcms freetype
 
-LIBS=-lfreetype  ./configure --prefix=/usr \
+  ./configure --prefix=/usr \
 	--enable-dynamic \
 	--with-ijs \
 	--with-jbig2dec \
@@ -47,6 +43,7 @@ LIBS=-lfreetype  ./configure --prefix=/usr \
 	--enable-fontconfig \
 	--enable-freetype \
 	--without-luratech \
+	--with-system-libtiff \
 	--disable-compile-inits #--help # needed for linking with system-zlib
   make
 
@@ -64,9 +61,9 @@ package() {
 	cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
 
   # install missing doc files # http://bugs.archlinux.org/task/18023
-  install -m 644 ${srcdir}/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/ghostscript/$_pkgver/doc/
+  install -m 644 ${srcdir}/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/${_pkgname}/$_pkgver/doc/
   
-  mkdir -p ${pkgdir}/usr/share/licenses/ghostscript
+  mkdir -p ${pkgdir}/usr/share/licenses/${_pkgname}
   install -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/
 
   # remove unwanted localized man-pages
diff --git a/libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch b/libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch
deleted file mode 100755
index 81b52a2e6..000000000
--- a/libre/gnu-ghostscript/gnu-ghostscript-cups-rgbw.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-diff -up gnu-ghostscript-9.04.1/cups/gdevcups.c.cups-rgbw ghostscript-9.04/cups/gdevcups.c
---- gnu-ghostscript-9.04.1/cups/gdevcups.c.cups-rgbw	2011-08-05 12:12:21.000000000 +0100
-+++ gnu-ghostscript-9.04.1/cups/gdevcups.c	2011-08-22 10:54:24.614010581 +0100
-@@ -225,6 +225,7 @@ typedef struct gx_device_cups_s
-   unsigned short	EncodeLUT[gx_max_color_value + 1];/* RGB value to output color LUT */
-   int			Density[CUPS_MAX_VALUE + 1];/* Density LUT */
-   int			Matrix[3][3][CUPS_MAX_VALUE + 1];/* Color transform matrix LUT */
-+  int                   user_icc;
-   int                   cupsRasterVersion;
- 
-   /* Used by cups_put_params(): */
-@@ -426,6 +427,7 @@ gx_device_cups	gs_cups_device =
-   {0x00},                                  /* EncodeLUT */
-   {0x00},                                  /* Density */
-   {0x00},                                  /* Matrix */
-+  0,
-   3                                     /* cupsRasterVersion */
- };
- 
-@@ -1182,15 +1184,18 @@ cups_map_cmyk(gx_device *pdev,		/* I - D
- 
-     case CUPS_CSPACE_RGB :
-     case CUPS_CSPACE_RGBW :
-+        c0 = c + k;
-+        c1 = m + k;
-+        c2 = y + k;
-         if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) {
--	  c0 = c;
--	  c1 = m;
--	  c2 = y;
--	  c3 = k;
--	} else {
--	  c0 = c + k;
--	  c1 = m + k;
--	  c2 = y + k;
-+	  if ((k >= frac_1 - 1) ||
-+	      ((c0 >= frac_1) && (c1 >= frac_1) && (c2 >= frac_1))) {
-+	    c0 = frac_1;
-+	    c1 = frac_1;
-+	    c2 = frac_1;
-+	    c3 = frac_1;
-+	  } else
-+	    c3 = 0;
- 	}
- 
-         if (c0 < 0)
-@@ -1212,11 +1217,12 @@ cups_map_cmyk(gx_device *pdev,		/* I - D
- 	out[2] = frac_1 - (frac)cups->Density[c2];
- 
-         if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) {
--	  if (c3 < 0)
--	    c3 = 0;
--	  else if (c3 > frac_1)
--	    c3 = frac_1;
--	  out[3] = frac_1 - (frac)cups->Density[c3];
-+	  if (c3 == 0)
-+	    out[3] = frac_1;
-+	  else if (c3 == frac_1)
-+	    out[3] = 0;
-+	  else
-+	    out[3] = frac_1;
- 	}
-         break;
- 
-@@ -2034,10 +2040,15 @@ cups_map_color_rgb(gx_device      *pdev,
-         * cups->DecodeLUT actually maps to RGBW, not CMYK...
- 	*/
- 
--        k = cups->DecodeLUT[c3];
--        c = cups->DecodeLUT[c0] + k - gx_max_color_value;
--        m = cups->DecodeLUT[c1] + k - gx_max_color_value;
--        y = cups->DecodeLUT[c2] + k - gx_max_color_value;
-+        if (c3 == 0) {
-+	  c = 0;
-+	  m = 0;
-+	  y = 0;
-+	} else {
-+	  c = cups->DecodeLUT[c0];
-+	  m = cups->DecodeLUT[c1];
-+	  y = cups->DecodeLUT[c2];
-+	}
- 
-         if (c > gx_max_color_value)
- 	  prgb[0] = gx_max_color_value;
-@@ -2282,20 +2293,20 @@ cups_map_rgb_color(gx_device      *pdev,
-           switch (cups->header.cupsBitsPerColor)
-           {
-             default :
--        	i = 0x0e;
-+        	i = 0x00;
-         	break;
-             case 2 :
--        	i = 0xfc;
-+        	i = 0x00;
-         	break;
-             case 4 :
--        	i = 0xfff0;
-+        	i = 0x0000;
-         	break;
-             case 8 :
--        	i = 0xffffff00;
-+        	i = 0x00000000;
-         	break;
- #ifdef GX_COLOR_INDEX_TYPE
- 	    case 16 :
--		i = 0xffffffffffff0000;
-+		i = 0x0000000000000000;
- 		break;
- #endif /* GX_COLOR_INDEX_TYPE */
-           }
-@@ -2929,7 +2940,10 @@ cups_put_params(gx_device     *pdev,	/* 
-   int                   xflip = 0,
-                         yflip = 0;
-   int                   found = 0;
--
-+  gs_param_string icc_pro_dummy;
-+  int old_cmps = cups->color_info.num_components;
-+  int old_depth = cups->color_info.depth;
-+  
- #ifdef DEBUG
-   dprintf2("DEBUG2: cups_put_params(%p, %p)\n", pdev, plist);
- #endif /* DEBUG */
-@@ -3024,6 +3038,11 @@ cups_put_params(gx_device     *pdev,	/* 
-   margins_set = param_read_float_array(plist, "Margins", &arrayval) == 0;
-   color_set   = param_read_int(plist, "cupsColorSpace", &intval) == 0 ||
-                 param_read_int(plist, "cupsBitsPerColor", &intval) == 0;
-+
-+  if (!cups->user_icc) {
-+      cups->user_icc = param_read_string(plist, "OutputICCProfile", &icc_pro_dummy) == 0;
-+  }
-+
-   /* We set the old dimensions to 1 if we have a color depth change, so
-      that memory reallocation gets forced. This is perhaps not the correct
-      approach to prevent crashes like in bug 690435. We keep it for the
-@@ -3134,12 +3153,20 @@ cups_put_params(gx_device     *pdev,	/* 
-   if ((code = gdev_prn_put_params(pdev, plist)) < 0)
-     return (code);
- 
-+  /* If cups_set_color_info() changed the color model of the device we want to
-+   * force the raster memory to be recreated/reinitialized
-+   */
-+  if (cups->color_info.num_components != old_cmps || cups->color_info.depth != old_depth) {
-+      width_old = 0;
-+      height_old = 0;
-+  }
-+  else {
-   /* pdev->width/height may have been changed by the call to
-    * gdev_prn_put_params()
-    */
--  width_old = pdev->width;
--  height_old = pdev->height;
--
-+     width_old = pdev->width;
-+     height_old = pdev->height;
-+  }
-  /*
-   * Update margins/sizes as needed...
-   */
-@@ -4044,22 +4071,88 @@ cups_set_color_info(gx_device *pdev)	/* 
-     for (k = 0; k <= CUPS_MAX_VALUE; k ++)
-       cups->Density[k] = k;
-   }
--  /* Set up the ICC profile for ghostscript to use based upon the color space.
--     This is different than the PPD profile above which appears to be some sort
--     of matrix based TRC profile */
--  switch (cups->header.cupsColorSpace) {
--      /* Use RGB profile for this */
--    case CUPS_CSPACE_RGBW:
--      if (pdev->icc_struct == NULL) {
--        pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
--      }
--      if (pdev->icc_struct->device_profile[gsDEFAULTPROFILE] == NULL) {
--            code = gsicc_set_device_profile(pdev, pdev->memory, 
--                DEFAULT_RGB_ICC, gsDEFAULTPROFILE);
--      }
--      break;
--    default:
--      break;
-+  if (!cups->user_icc) {
-+    /* Set up the ICC profile for ghostscript to use based upon the color space.
-+       This is different than the PPD profile above which appears to be some sort
-+       of matrix based TRC profile */
-+    switch (cups->header.cupsColorSpace)
-+    {
-+      default :
-+      case CUPS_CSPACE_RGBW :
-+      case CUPS_CSPACE_RGB :
-+      case CUPS_CSPACE_RGBA :
-+      case CUPS_CSPACE_CMY :
-+      case CUPS_CSPACE_YMC :
-+#    ifdef CUPS_RASTER_HAVE_COLORIMETRIC
-+      case CUPS_CSPACE_CIELab :
-+      case CUPS_CSPACE_ICC1 :
-+      case CUPS_CSPACE_ICC2 :
-+      case CUPS_CSPACE_ICC3 :
-+      case CUPS_CSPACE_ICC4 :
-+      case CUPS_CSPACE_ICC5 :
-+      case CUPS_CSPACE_ICC6 :
-+      case CUPS_CSPACE_ICC7 :
-+      case CUPS_CSPACE_ICC8 :
-+      case CUPS_CSPACE_ICC9 :
-+      case CUPS_CSPACE_ICCA :
-+      case CUPS_CSPACE_ICCB :
-+      case CUPS_CSPACE_ICCC :
-+      case CUPS_CSPACE_ICCD :
-+      case CUPS_CSPACE_ICCE :
-+      case CUPS_CSPACE_ICCF :
-+#    endif /* CUPS_RASTER_HAVE_COLORIMETRIC */
-+        if (!pdev->icc_struct || (pdev->icc_struct &&
-+             pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsRGB)) {
-+
-+          if (pdev->icc_struct) {
-+              rc_decrement(pdev->icc_struct, "cups_set_color_info");            
-+          }
-+          pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
-+
-+          code = gsicc_set_device_profile(pdev, pdev->memory, 
-+              (char *)DEFAULT_RGB_ICC, gsDEFAULTPROFILE);
-+          }
-+        break;
-+
-+      case CUPS_CSPACE_W :
-+      case CUPS_CSPACE_WHITE :
-+      case CUPS_CSPACE_K :
-+      case CUPS_CSPACE_GOLD :
-+      case CUPS_CSPACE_SILVER :
-+        if (!pdev->icc_struct || (pdev->icc_struct &&
-+             pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsGRAY)) {
-+
-+          if (pdev->icc_struct) {
-+              rc_decrement(pdev->icc_struct, "cups_set_color_info");            
-+          }
-+          pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
-+
-+          code = gsicc_set_device_profile(pdev, pdev->memory->non_gc_memory, 
-+              (char *)DEFAULT_GRAY_ICC, gsDEFAULTPROFILE);
-+        }
-+        break;
-+      case CUPS_CSPACE_KCMYcm :
-+#    ifdef CUPS_RASTER_HAVE_COLORIMETRIC
-+      case CUPS_CSPACE_CIEXYZ :
-+#endif
-+      case CUPS_CSPACE_CMYK :
-+      case CUPS_CSPACE_YMCK :
-+      case CUPS_CSPACE_KCMY :
-+      case CUPS_CSPACE_GMCK :
-+      case CUPS_CSPACE_GMCS :
-+        if (!pdev->icc_struct || (pdev->icc_struct &&
-+             pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsCMYK)) {
-+
-+          if (pdev->icc_struct) {
-+              rc_decrement(pdev->icc_struct, "cups_set_color_info");            
-+          }
-+          pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory);
-+
-+          code = gsicc_set_device_profile(pdev, pdev->memory, 
-+              (char *)DEFAULT_CMYK_ICC, gsDEFAULTPROFILE);
-+          }
-+        break;
-+    }
-   }
- }
- 
diff --git a/libre/gnu-ghostscript/libtool.patch b/libre/gnu-ghostscript/libtool.patch
index 4271ce69b..4271ce69b 100755..100644
--- a/libre/gnu-ghostscript/libtool.patch
+++ b/libre/gnu-ghostscript/libtool.patch
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
new file mode 100644
index 000000000..2e0658cfb
--- /dev/null
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -0,0 +1,83 @@
+# $Id: PKGBUILD 153258 2012-03-12 16:05:19Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgbase=gst-plugins-bad
+pkgname=gst-plugins-bad-libre
+pkgver=1.0.2
+pkgrel=1
+pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+license=(
+  LGPL
+)
+url="http://gstreamer.freedesktop.org/"
+depends=(
+  celt
+  chromaprint
+  curl
+  faad2
+  gst-plugins-base-libs
+  libdca
+  libdvdnav
+  libgme
+  libmms
+  libmodplug
+  mjpegtools
+  mpg123
+  opus
+  soundtouch
+  spandsp
+)
+makedepends=(
+  libdvdread
+  libexif
+  libmpeg2
+  libvdpau
+  schroedinger
+)
+provides=(
+  $pkgbase=$pkgver
+)
+conflicts=(
+  $pkgbase
+)
+replaces=(
+  $pkgbase 
+)
+options=(
+  '!libtool'
+  '!emptydirs'
+)
+source=(
+  "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz"
+)
+sha256sums=(
+  9e503305799a2b6eb9d0b77c59b8aa8bbe9e6eb815a0635bd013560c73996579
+)
+
+build() {
+  cd $pkgbase-$pkgver
+  sed -i '/AC_PATH_XTRA/d' configure.ac
+  autoreconf
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-experimental \
+    --with-package-name='GStreamer Bad Plugins Libre (Parabola)' \
+    --with-package-origin='http://www.parabolagnulinux.org/' \
+    --with-gtk=3.0
+  make
+}
+
+check() {
+  cd $pkgbase-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgbase-$pkgver
+  make DESTDIR=$pkgdir install
+}
diff --git a/libre/icedove-i18n/PKGBUILD b/libre/icedove-i18n/PKGBUILD
index 6d1e339a2..7d0aa1d8b 100755
--- a/libre/icedove-i18n/PKGBUILD
+++ b/libre/icedove-i18n/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id$
-# Maintainer: Márcio Silva <coadde@adinet.com.uy>
-# Maintainer: André Silva <andre.paulista@adinet.com.uy>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgbase=icedove-i18n
-pkgver=11.0.1
+pkgver=16.0.2.1
 pkgname=('icedove-i18n-ar'
-        #'icedove-i18n-af'
+         'icedove-i18n-ast'
          'icedove-i18n-be'
-         'icedove-i18n-bn-bd'
          'icedove-i18n-bg'
+         'icedove-i18n-bn-bd'
          'icedove-i18n-br'
          'icedove-i18n-ca'
          'icedove-i18n-cs'
@@ -16,28 +15,31 @@ pkgname=('icedove-i18n-ar'
          'icedove-i18n-de'
          'icedove-i18n-el'
          'icedove-i18n-en-gb'
+         'icedove-i18n-en-us'
          'icedove-i18n-es-ar'
-         'icedove-i18n-es'
+         'icedove-i18n-es-es'
          'icedove-i18n-et'
          'icedove-i18n-eu'
          'icedove-i18n-fi'
          'icedove-i18n-fr'
          'icedove-i18n-fy-nl'
-         'icedove-i18n-ga'
+         'icedove-i18n-ga-ie'
          'icedove-i18n-gd'
          'icedove-i18n-gl'
          'icedove-i18n-he'
+         'icedove-i18n-hr'
          'icedove-i18n-hu'
+         'icedove-i18n-hy-am'
          'icedove-i18n-id'
          'icedove-i18n-is'
          'icedove-i18n-it'
          'icedove-i18n-ja'
          'icedove-i18n-ko'
          'icedove-i18n-lt'
-         'icedove-i18n-nb'
+         'icedove-i18n-nb-no'
          'icedove-i18n-nl'
-         'icedove-i18n-nn'
-         'icedove-i18n-pa'
+         'icedove-i18n-nn-no'
+         'icedove-i18n-pa-in'
          'icedove-i18n-pl'
          'icedove-i18n-pt-br'
          'icedove-i18n-pt'
@@ -48,7 +50,8 @@ pkgname=('icedove-i18n-ar'
          'icedove-i18n-sk'
          'icedove-i18n-sl'
          'icedove-i18n-sq'
-         'icedove-i18n-sv'
+         'icedove-i18n-sr'
+         'icedove-i18n-sv-se'
          'icedove-i18n-ta-lk'
          'icedove-i18n-tr'
          'icedove-i18n-uk'
@@ -56,7 +59,7 @@ pkgname=('icedove-i18n-ar'
          'icedove-i18n-zh-cn'
          'icedove-i18n-zh-tw')
 
-pkgrel=3
+pkgrel=1
 pkgdesc="Language pack for Debian Icedove"
 arch=('any')
 url="http://packages.debian.org/source/experimental/icedove"
@@ -64,10 +67,10 @@ license=('MPL' 'GPL')
 depends=("icedove-libre>=$pkgver")
 _url=http://repo.parabolagnulinux.org/other/$pkgbase/releases/$pkgver
 source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.xpi
-#       icedove-i18n-$pkgver-af.xpi::$_url/af.xpi
+        icedove-i18n-$pkgver-ast.xpi::$_url/ast.xpi
         icedove-i18n-$pkgver-be.xpi::$_url/be.xpi
-        icedove-i18n-$pkgver-bn-BD.xpi::$_url/bn-BD.xpi
         icedove-i18n-$pkgver-bg.xpi::$_url/bg.xpi
+        icedove-i18n-$pkgver-bn-BD.xpi::$_url/bn-BD.xpi
         icedove-i18n-$pkgver-br.xpi::$_url/br.xpi
         icedove-i18n-$pkgver-ca.xpi::$_url/ca.xpi
         icedove-i18n-$pkgver-cs.xpi::$_url/cs.xpi
@@ -75,6 +78,7 @@ source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.xpi
         icedove-i18n-$pkgver-de.xpi::$_url/de.xpi
         icedove-i18n-$pkgver-el.xpi::$_url/el.xpi
         icedove-i18n-$pkgver-en-GB.xpi::$_url/en-GB.xpi
+        icedove-i18n-$pkgver-en-US.xpi::$_url/en-US.xpi
         icedove-i18n-$pkgver-es-AR.xpi::$_url/es-AR.xpi
         icedove-i18n-$pkgver-es-ES.xpi::$_url/es-ES.xpi
         icedove-i18n-$pkgver-et.xpi::$_url/et.xpi
@@ -86,7 +90,9 @@ source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.xpi
         icedove-i18n-$pkgver-gd.xpi::$_url/gd.xpi
         icedove-i18n-$pkgver-gl.xpi::$_url/gl.xpi
         icedove-i18n-$pkgver-he.xpi::$_url/he.xpi
+        icedove-i18n-$pkgver-hr.xpi::$_url/hr.xpi
         icedove-i18n-$pkgver-hu.xpi::$_url/hu.xpi
+        icedove-i18n-$pkgver-hy-AM.xpi::$_url/hy-AM.xpi
         icedove-i18n-$pkgver-id.xpi::$_url/id.xpi
         icedove-i18n-$pkgver-is.xpi::$_url/is.xpi
         icedove-i18n-$pkgver-it.xpi::$_url/it.xpi
@@ -107,6 +113,7 @@ source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.xpi
         icedove-i18n-$pkgver-sk.xpi::$_url/sk.xpi
         icedove-i18n-$pkgver-sl.xpi::$_url/sl.xpi
         icedove-i18n-$pkgver-sq.xpi::$_url/sq.xpi
+        icedove-i18n-$pkgver-sr.xpi::$_url/sr.xpi
         icedove-i18n-$pkgver-sv-SE.xpi::$_url/sv-SE.xpi
         icedove-i18n-$pkgver-ta-LK.xpi::$_url/ta-LK.xpi
         icedove-i18n-$pkgver-tr.xpi::$_url/tr.xpi
@@ -126,31 +133,34 @@ package_icedove-i18n-ar() {
   install -Dm644 icedove-i18n-$pkgver-ar.xpi "${pkgdir}/$_path/langpack-ar@icedove.mozilla.org.xpi"
 }
 
+package_icedove-i18n-ast() {
+  pkgdesc="Language packs for Debian Icedove."
+  cd ${srcdir}
+  install -Dm644 icedove-i18n-$pkgver-ast.xpi "${pkgdir}/$_path/langpack-ast@icedove.mozilla.org.xpi"
+}
+
 package_icedove-i18n-af() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-af
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-af.xpi "${pkgdir}/$_path/langpack-af@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-be() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-be
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-be.xpi "${pkgdir}/$_path/langpack-be@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-bn-bd() {
+package_icedove-i18n-bg() {
   pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-bn-BD.xpi "${pkgdir}/$_path/langpack-bn-BE@icedove.mozilla.org.xpi"
+  install -Dm644 icedove-i18n-$pkgver-bg.xpi "${pkgdir}/$_path/langpack-bg@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-bg() {
+package_icedove-i18n-bn-bd() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-bg
   cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-bg.xpi "${pkgdir}/$_path/langpack-bg@icedove.mozilla.org.xpi"
+  install -Dm644 icedove-i18n-$pkgver-bn-BD.xpi "${pkgdir}/$_path/langpack-bn-BD@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-br() {
@@ -161,84 +171,79 @@ package_icedove-i18n-br() {
 
 package_icedove-i18n-ca() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-ca
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ca.xpi "${pkgdir}/$_path/langpack-ca@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-cs() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-cs
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-cs.xpi "${pkgdir}/$_path/langpack-cs@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-da() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-da
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-da.xpi "${pkgdir}/$_path/langpack-da@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-de() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-de
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-de.xpi "${pkgdir}/$_path/langpack-de@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-el() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-el
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-el.xpi "${pkgdir}/$_path/langpack-el@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-en-gb() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-en-gb
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-en-GB.xpi "${pkgdir}/$_path/langpack-en-GB@icedove.mozilla.org.xpi"
 }
 
+package_icedove-i18n-en-us() {
+  pkgdesc="Language packs for Debian Icedove."
+  cd ${srcdir}
+  install -Dm644 icedove-i18n-$pkgver-en-US.xpi "${pkgdir}/$_path/langpack-en-US@icedove.mozilla.org.xpi"
+}
+
 package_icedove-i18n-es-ar() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-es-ar
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-es-AR.xpi "${pkgdir}/$_path/langpack-es-AR@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-es() {
+package_icedove-i18n-es-es() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-es
+  replaces=icedove-i18n-es
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-es-ES.xpi "${pkgdir}/$_path/langpack-es-ES@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-et() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-et
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-et.xpi "${pkgdir}/$_path/langpack-et@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-eu() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-eu
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-eu.xpi "${pkgdir}/$_path/langpack-eu@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-fi() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-fi
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-fi.xpi "${pkgdir}/$_path/langpack-fi@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-fr() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-fr
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-fr.xpi "${pkgdir}/$_path/langpack-fr@icedove.mozilla.org.xpi"
 }
@@ -249,9 +254,9 @@ package_icedove-i18n-fy-nl(){
   install -Dm644 icedove-i18n-$pkgver-fy-NL.xpi "${pkgdir}/$_path/langpack-fy-NL@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-ga() {
+package_icedove-i18n-ga-ie() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-ga
+  replaces=icedove-i18n-ga
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ga-IE.xpi "${pkgdir}/$_path/langpack-ga-IE@icedove.mozilla.org.xpi"
 }
@@ -270,18 +275,28 @@ package_icedove-i18n-gl() {
 
 package_icedove-i18n-he() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-he
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-he.xpi "${pkgdir}/$_path/langpack-he@icedove.mozilla.org.xpi"
 }
 
+package_icedove-i18n-hr() {
+  pkgdesc="Language packs for Debian Icedove."
+  cd ${srcdir}
+  install -Dm644 icedove-i18n-$pkgver-hr.xpi "${pkgdir}/$_path/langpack-hr@icedove.mozilla.org.xpi"
+}
+
 package_icedove-i18n-hu() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-hu
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-hu.xpi "${pkgdir}/$_path/langpack-hu@icedove.mozilla.org.xpi"
 }
 
+package_icedove-i18n-hy-am() {
+  pkgdesc="Language packs for Debian Icedove."
+  cd ${srcdir}
+  install -Dm644 icedove-i18n-$pkgver-hy-AM.xpi "${pkgdir}/$_path/langpack-hy-am@icedove.mozilla.org.xpi"
+}
+
 package_icedove-i18n-id(){
   pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
@@ -296,91 +311,81 @@ package_icedove-i18n-is() {
 
 package_icedove-i18n-it() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-it
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-it.xpi "${pkgdir}/$_path/langpack-it@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-ja() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-ja
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ja.xpi "${pkgdir}/$_path/langpack-ja@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-ko() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-ko
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ko.xpi "${pkgdir}/$_path/langpack-ko@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-lt() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-lt
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-lt.xpi "${pkgdir}/$_path/langpack-lt@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-nb() {
+package_icedove-i18n-nb-no() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-nb
+  replaces=icedove-i18n-nb
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-nb-NO.xpi "${pkgdir}/$_path/langpack-nb-NO@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-mk() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-mk
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-mk.xpi "${pkgdir}/$_path/langpack-mk@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-nl() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-nl
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-nl.xpi "${pkgdir}/$_path/langpack-nl@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-nn() {
+package_icedove-i18n-nn-no() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-nn
+  replaces=icedove-i18n-nn
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-nn-NO.xpi "${pkgdir}/$_path/langpack-nn-NO@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-pa() {
+package_icedove-i18n-pa-in() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-pa
+  replaces=icedove-i18n-pa
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-pa-IN.xpi "${pkgdir}/$_path/langpack-pa-IN@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-pl() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-pl
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-pl.xpi "${pkgdir}/$_path/langpack-pl@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-pt-br() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-pt-br
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-pt-BR.xpi "${pkgdir}/$_path/langpack-pt-BR@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-pt() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-pt
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-pt-PT.xpi "${pkgdir}/$_path/langpack-pt-PT@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-ro() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-ro
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ro.xpi "${pkgdir}/$_path/langpack-ro@icedove.mozilla.org.xpi"
 }
@@ -393,7 +398,6 @@ package_icedove-i18n-rm() {
 
 package_icedove-i18n-ru() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-ru
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ru.xpi "${pkgdir}/$_path/langpack-ru@icedove.mozilla.org.xpi"
 }
@@ -406,50 +410,49 @@ package_icedove-i18n-si() {
 
 package_icedove-i18n-sk() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-sk
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-sk.xpi "${pkgdir}/$_path/langpack-sk@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-sl() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-sl
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-sl.xpi "${pkgdir}/$_path/langpack-sl@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-sq() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-sl
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-sq.xpi "${pkgdir}/$_path/langpack-sq@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-sv() {
+package_icedove-i18n-sr() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-sv
+  cd ${srcdir}
+  install -Dm644 icedove-i18n-$pkgver-sr.xpi "${pkgdir}/$_path/langpack-sr@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-sv-se() {
+  pkgdesc="Language packs for Debian Icedove."
+  replaces=icedove-i18n-sv
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-sv-SE.xpi "${pkgdir}/$_path/langpack-sv-SE@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-ta-lk() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-sv
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ta-LK.xpi "${pkgdir}/$_path/langpack-ta-LK@icedove.mozilla.org.xpi"
 }
 
-
 package_icedove-i18n-tr() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-tr
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-tr.xpi "${pkgdir}/$_path/langpack-tr@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-uk() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-uk
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-uk.xpi "${pkgdir}/$_path/langpack-uk@icedove.mozilla.org.xpi"
 }
@@ -461,64 +464,67 @@ package_icedove-i18n-vi() {
 }
 package_icedove-i18n-zh-cn() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-zh-cn
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-zh-CN.xpi "${pkgdir}/$_path/langpack-zh-CN@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-zh-tw() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-zh-tw
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-zh-TW.xpi "${pkgdir}/$_path/langpack-zh-TW@icedove.mozilla.org.xpi"
 }
-md5sums=('43ea2aeec780c591af577215a8f928ae'
-         '0dc7a6ca6d308f4135ce135b87b19823'
-         '343f4b73820d9906205606833c48ddd1'
-         '56f7a9e47037c82fda2d97efcac6e2fa'
-         '7da75017f43c073b7f7e413d41794a37'
-         '07c7efe6d9400b17ef572c5769f25ccd'
-         '8dba7a9ff2c2b55908bb32b947fab75e'
-         'e262a088217fceb213a8890124e85db6'
-         '9c2355ff0ca0b640e50f7a24ec5d9f6e'
-         '628c84299fc7b76a5f084905518b8f73'
-         'a26276362394dedbbea98356d573f2f1'
-         '06c0ed88ff10c296f2066a7a84cc33d6'
-         '2a03c69e72bbe08e8938177908a3ab17'
-         'e80febfd74cc81bc9e5cb9752c0b3b95'
-         '4ad12b69da9910e1c0122aa76c3513d5'
-         '5e9c7ab66141389b9300f8db28852a5a'
-         'c3390ce9a18b979fe148652fc76ae311'
-         '85c17fe5018696d6999e7fed8c447edc'
-         'a049d7cf3b9c9ef5ece4afced3b56f9d'
-         'c483f4da184315444d1d094fd75b150a'
-         'e57eba03836a14e8915a816a7655fb46'
-         'c4d4caf6baf85ca22ed1ea19a3630d67'
-         'e16465d4d1234fe7362b5ba2f73682f9'
-         '36fb64f2541e5a7ba0640931e8ee2be1'
-         'd03b2ddcfc3cf28e1725df4972e2abfe'
-         'f5fcf08545542a752b7355d1dd692c2d'
-         '842c4ce562c0beba6713424551d5d748'
-         '004c5c6a1a5bb575827fe626e0b804cc'
-         '0d810b4347b21d43d8b38fd077a63f9d'
-         'e03ac78e858e0d345512bcc24f180838'
-         'e17ab7b097085b9462d38a7d8aa4d027'
-         'f58b78d51281acf36c9755abb6bbde14'
-         '086270a5669cb5db0a21bf5ca1c7620c'
-         'c972a8eaf135cfeb9509603ae1d392d3'
-         'c4eb654adce293e9ef6fe2cb2b1078bc'
-         'd120891141f898644a93bb2317def809'
-         '78c32f4f1c814130f9cddce60b17a089'
-         '055d77477e07632dcb06a08d51609514'
-         '9b28657c99b9193cef3dbf959ed1849c'
-         '5c6ca9cd178df6a6fca1f638a0845b0a'
-         '277cf819683b9a9016b322a77a3236fa'
-         '7104f5238b221ea4dc502c14eae12ea1'
-         'a29ed3f28bab6a970c15378505b352cc'
-         '5774b9adccafa40221e6eb3011de5db0'
-         '5419f4456c65703ebeb9d4befc0c2d2c'
-         '2423b38ceb1022a6064070a3f7f5600f'
-         '5de7fd60a6a74bf23066a6cfe9dee2d6'
-         '47a23af3184ee6999433a9f59da3a67a'
-         'd3242d7e7c35df585e55918ed6556f16'
-         'd0f7e27dfdc4aa14398e8422e3135a4a')
+md5sums=('9c4a59c7da66e2354164c3a5bc7af21d'
+         '1cc30ebb50c2ff783b07060fe14b4260'
+         'bd2a994f1b0aa8d71b7f432f582e08b5'
+         '1b7d5f199b714e5d235cdadc89882c82'
+         'a5945807be0c8e205cf0f4be41d1f301'
+         'ec323d1ea8372afa236ed82d1f38bf62'
+         '04985b1bb7a7255970de1c9a0d6b6c37'
+         '143d16162ded3cf1ed99731e0ccd4cbc'
+         'ec04abda3d2eafd5cccad44b843d2191'
+         'a1273c8ba22f38f0304d44f52095541d'
+         '06ff7794da97ef3cad3ccfde2a229db3'
+         'bb873b67b1e65eccf186622c1315e14b'
+         '87ea24ef462fed8a3f6e74e25b210607'
+         'c7363deffa336c8470884ca7500ff583'
+         '64d7b4490bbe3cdb25cc8633d46761d4'
+         '1bc28fd43fbe54185e0f34161e2bb856'
+         'f90cedcac1daa1a7be9abc9a960bbde0'
+         '326a063d3b5d0aff735a145dcbb51e01'
+         '86ff061d2346b75b85e59374328d20f8'
+         '83969caa207fa30dd016fee6bd2aa543'
+         '68d50a5c356d62514bfa99b04776ed7c'
+         'f5ffaa9dc1da2412faf78a4920d19278'
+         'a76518ba680a2fc263de99099e0e1c53'
+         'e88f3c95cf4e51035429307f4f6a4eb5'
+         'c2573d6f463cdd69f6b37612f9ae997a'
+         '8b17220cd897ea744978752b2ef11ab0'
+         '4ee8b3d2e4fd7bf3353a910d76cbbaf8'
+         'f87d295343ecf5b1e21abe430b157c42'
+         '74ce04669c8acf87a8b8878fb2653dc4'
+         '5ffc16a8c701c8c2c133775a815d1e67'
+         '6d6c1a7e31bf6301ee690509881a4395'
+         '41c970fd7ef2224a63de7d562ce71b39'
+         'a4243831934d31aad648221190fe2b42'
+         '6c1c023d67a35e4ed3a792bb365f360e'
+         '0045f4bceaaddd57fa6c0b895a34feff'
+         '18b359d881127defff20e549bb0c5b80'
+         'a295fbd180dfe3e009218aa2775ce332'
+         '6beaeaf5bf67321fdef0ee6de968edaa'
+         '92b29bc95a476d9cb75c5df075f353b9'
+         'fa757024edb1f1f794f77ecee8c07706'
+         '8f21adb897625a2a27a040a8e88bed3f'
+         '26b5ab6bb93b454702179c48c9da2e5b'
+         'f319345cdc962919830792644c66165d'
+         '7f32885e485beab6822eb9ec0025bae7'
+         'edf019e6332d099d67b68f1f90da680c'
+         'e21836a77f143457ac7912ee0e6386dc'
+         '24adc86b3fb496f3d27944a5027d5fa9'
+         '7192e7c7d80cc8eb85e1f57defa0496c'
+         'f449ced45bb084ce0adda6df89b1ee31'
+         '25e3ce79fc2c1e2164ce04821e683a29'
+         '615138d3ed86797a168a0d5784f0c6fe'
+         '7c83196da5ee2d01444450cca620c29d'
+         '265f8447eee6e6b41ab8fdcf1a1dc154'
+         '9889d38b50a7e2d095582ebf75cab9e2'
+         '12b882986056bca65fdfc90806daf87b')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 6bd50cd47..6ec577f58 100755
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer : Márcio Silva <coadde@adinet.com.uy>
-# Maintainer : André Silva <andre.paulista@adinet.com.uy>
+# Maintainer : Márcio Silva <coadde@lavabit.com>
+# Maintainer : André Silva <emulatorman@lavabit.com>
 
 # We're getting this from Debian Experimental
 _debname=icedove
-_debver=11.0
+_debver=16.0.2
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=3
 pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla Thunderbird."
 arch=('i586' 'i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
@@ -22,24 +22,23 @@ optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
 conflicts=('thunderbird')
 provides=('thunderbird')
-install=$_pkgname.install
+install=${_pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
         mozconfig
         channel-prefs.js
         vendor.js
-        gcc47.patch
-        clrf.patch
         makefile.patch
+        branding.patch
         ${_pkgname}.desktop)
-md5sums=('0d4aaf892cd1cbf9bda38928947025fe'
-         'd4401c080fe5190e8bb1326f10808231'
+options=(!emptydirs)
+md5sums=('a3724f40d28014acf593528bb8a048f0'
+         '53d62a4841d7989d1f6d1b04929394b4'
          'd6d58d3104a44624e0a3d227cdf1c211'
          '476ec205162340fb0679f522c9d31c3b'
          '4eecc4fc5aafaf0da651a09eadc90bee'
-         '94d5cd599ccc4438f192d8daabf98b6a'
-         'c395d443a8c4c16880c7322bcf174743'
          'c4ed43e85945e180a89cce03e45ec62c'
+         '126b1446212396c33220936c01d9592d'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
 
 build() {
@@ -61,9 +60,8 @@ build() {
   done
   quilt push -av
 
-  patch -Np1 -i "$srcdir/gcc47.patch"
-  patch -Np1 -i "$srcdir/clrf.patch"
-  patch -Np1 -i "$srcdir/makefile.patch"
+  patch -Np1 -i "${srcdir}/makefile.patch" # small fix
+  patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
 
   cp "${srcdir}/mozconfig" .mozconfig
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
@@ -74,17 +72,18 @@ package() {
 
   make -j1 -f client.mk DESTDIR="${pkgdir}" install
 
-  install -m644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref"
+  install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js"
+
   # Recommend free addons
-  install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref"
+  install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref/channel-prefs.js"
 
   for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do
       install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
   done
   install -Dm644 "debian/app-icons/${_pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
   
-  install -Dm644 "$srcdir/${_pkgname}.desktop" \
-      "$pkgdir/usr/share/applications/${_pkgname}.desktop"
+  install -Dm644 "${srcdir}/${_pkgname}.desktop" \
+      "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
   
   rm -rf "${pkgdir}"/usr/lib/${_pkgname}/{dictionaries,hyphenation,searchplugins}
   ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${_pkgname}/dictionaries"
diff --git a/libre/icedove-libre/branding.patch b/libre/icedove-libre/branding.patch
new file mode 100644
index 000000000..d84b8075a
--- /dev/null
+++ b/libre/icedove-libre/branding.patch
@@ -0,0 +1,19 @@
+diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd comm-release/mail/branding/icedove/locales/en-US/brand.dtd
+--- comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd	2012-10-30 16:41:16.000000000 -0200
++++ comm-release/mail/branding/icedove/locales/en-US/brand.dtd	2012-10-31 22:35:04.203666114 -0200
+@@ -1,4 +1,4 @@
+ <!ENTITY  brandShortName        "Icedove">
+-<!ENTITY  brandFullName         "Icedove Mail/News">
+-<!ENTITY  vendorShortName       "Icedove">
++<!ENTITY  brandFullName         "Icedove">
++<!ENTITY  vendorShortName       "Mozilla">
+ <!ENTITY  trademarkInfo.part1   " ">
+diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties comm-release/mail/branding/icedove/locales/en-US/brand.properties
+--- comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties	2012-10-30 10:13:50.000000000 -0200
++++ comm-release/mail/branding/icedove/locales/en-US/brand.properties	2012-10-31 22:35:14.786423732 -0200
+@@ -1,3 +1,3 @@
+ brandShortName=Icedove
+-brandFullName=Icedove Mail/News
+-vendorShortName=Icedove
++brandFullName=Icedove
++vendorShortName=Mozilla
diff --git a/libre/icedove-libre/channel-prefs.js b/libre/icedove-libre/channel-prefs.js
index 13b1ba388..13b1ba388 100755..100644
--- a/libre/icedove-libre/channel-prefs.js
+++ b/libre/icedove-libre/channel-prefs.js
diff --git a/libre/icedove-libre/clrf.patch b/libre/icedove-libre/clrf.patch
deleted file mode 100755
index 375708ac4..000000000
--- a/libre/icedove-libre/clrf.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-diff -Nur comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
---- comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-03-12 23:37:12.000000000 -0300
-+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-05-07 12:33:58.517612453 -0300
-@@ -688,7 +688,7 @@
-     PL_strcat(encoding, "{");
-     lengthStr.AppendInt((PRInt32) strlen(value));
-     PL_strcat(encoding, lengthStr.get());
--    PL_strcat(encoding, "}"CRLF);
-+    PL_strcat(encoding, "}" CRLF);
-     PL_strcat(encoding, value);
-     return NS_OK;
-   }
-diff -Nur comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
---- comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-05-07 12:41:08.003264793 -0300
-@@ -753,7 +753,7 @@
-           }
-         }
-       }
--#define EXTRA_KEYWORD_HDR "                                                                                 "MSG_LINEBREAK
-+#define EXTRA_KEYWORD_HDR "                                                                                 " MSG_LINEBREAK
- 
-        // if status offset isn't in the first block, this code won't work. There's no good reason
-       // for the status offset not to be at the beginning of the message anyway.
-@@ -1203,7 +1203,7 @@
-         // check if there's an envelope header; if not, write one.
-         if (strncmp(m_dataBuffer, "From ", 5))
-         {
--          m_fileStream->Write("From "CRLF, 7, &bytesWritten);
-+          m_fileStream->Write("From " CRLF, 7, &bytesWritten);
-           m_offlineMsgSize += bytesWritten;
-         }
-       }
-diff -Nur comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
---- comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp	2012-05-07 12:44:43.127347489 -0300
-@@ -1722,7 +1722,7 @@
- {
-   m_sendDone = PR_TRUE;
-   nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
--  SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
-+  SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server.
-   m_nextState = SMTP_RESPONSE;
-   m_nextStateAfterResponse = SMTP_DONE;
-   return(0);
-@@ -1969,7 +1969,7 @@
-     {
-       nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
-       // send a quit command to close the connection with the server.
--      if (SendData(url, "QUIT"CRLF) == NS_OK)
-+      if (SendData(url, "QUIT" CRLF) == NS_OK)
-       {
-         m_nextState = SMTP_RESPONSE;
-         m_nextStateAfterResponse = SMTP_ERROR_DONE;
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp comm-release/mailnews/imap/src/nsImapMailFolder.cpp
---- comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp	2012-05-07 12:48:29.417179064 -0300
-@@ -8298,7 +8298,7 @@
-           bool needMoreData = false;
-           char * newLine = nsnull;
-           PRUint32 numBytesInLine = 0;
--          const char *envelope = "From "CRLF;
-+          const char *envelope = "From " CRLF;
-           offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
-           fileSize += bytesWritten;
-           do
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp comm-release/mailnews/imap/src/nsImapProtocol.cpp
---- comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp	2012-05-07 15:45:58.551202719 -0300
-@@ -1410,7 +1410,7 @@
- {
-   // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
-   nsCAutoString commandBuffer(GetServerCommandTag());
--  commandBuffer.Append(" IDLE"CRLF);
-+  commandBuffer.Append(" IDLE" CRLF);
- 
-   do
-   {
-@@ -3290,7 +3290,7 @@
-     commandString.Append(messageIds);
-     commandString.Append(" (");
-     commandString.Append(attribute);
--    commandString.Append(")"CRLF);
-+    commandString.Append(")" CRLF);
-     nsresult rv = SendData(commandString.get());
- 
-     if (NS_SUCCEEDED(rv))
-@@ -5283,7 +5283,7 @@
- 
-   IncrementCommandTagNumber();
-   nsCAutoString command(GetServerCommandTag());
--  command.Append(" expunge"CRLF);
-+  command.Append(" expunge" CRLF);
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -5359,7 +5359,7 @@
-   command.Append(gAppName);
-   command.Append("\" \"version\" \"");
-   command.Append(gAppVersion);
--  command.Append("\")"CRLF);
-+  command.Append("\")" CRLF);
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -5816,7 +5816,7 @@
-     nsCAutoString correctedPassword;
-     EscapeUserNamePasswordString(password.get(), &correctedPassword);
-     command.Append(correctedPassword);
--    command.Append("\""CRLF);
-+    command.Append("\"" CRLF);
-     rv = SendData(command.get(), PR_TRUE /* suppress logging */);
-     NS_ENSURE_SUCCESS(rv, rv);
-     ParseIMAPandCheckForNewMail();
-@@ -7446,7 +7446,7 @@
-   nsCString command(GetServerCommandTag());
-   command += " create \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if(NS_SUCCEEDED(rv))
-@@ -7549,7 +7549,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " lsub \"\" \"";
-   command += escapedPattern;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   PR_Free(boxnameWithOnlineDirectory);
- 
-@@ -7578,7 +7578,7 @@
-   command += useXLIST ?
-     " xlist \"\" \"" : " list \"\" \"";
-   command += escapedPattern;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   PR_Free(boxnameWithOnlineDirectory);
- 
-@@ -7599,7 +7599,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " subscribe \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -7617,7 +7617,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " unsubscribe \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -7631,7 +7631,7 @@
-   if (m_urlInProgress)
-     return;
-   nsCAutoString command (GetServerCommandTag());
--  command += " IDLE"CRLF;
-+  command += " IDLE" CRLF;
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-   {
-@@ -7658,7 +7658,7 @@
-   nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
-   if (asyncInputStream)
-     asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
--  nsresult rv = SendData("DONE"CRLF);
-+  nsresult rv = SendData("DONE" CRLF);
-   // set a short timeout if we don't want to wait for a response
-   if (m_transport && !waitForResponse)
-     m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
-@@ -7727,8 +7727,8 @@
-   PRUint32 msgsHandled = 0;
-   const char *formatString;
-   formatString = (idsAreUid)
--      ? "%s uid store %s %s"CRLF
--      : "%s store %s %s"CRLF;
-+      ? "%s uid store %s %s" CRLF
-+      : "%s store %s %s" CRLF;
- 
-   do
-   {
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
---- comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-05-07 12:57:22.050615120 -0300
-@@ -185,7 +185,7 @@
-   
-   NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && 
-     *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
--  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
-+  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
-   if (sendingIdleDone)
-     fWaitingForMoreClientInput = PR_FALSE;
- 
-diff -Nur comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp comm-release/mailnews/local/src/nsPop3Protocol.cpp
---- comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp	2012-05-07 12:59:45.857182813 -0300
-@@ -2483,7 +2483,7 @@
-         return(MK_OUT_OF_MEMORY);
-     m_pop3ConData->next_state_after_response = POP3_GET_LIST;
-     m_listpos = 0;
--    return SendData(m_url, "LIST"CRLF);
-+    return SendData(m_url, "LIST" CRLF);
- }
- 
- 
-diff -Nur comm-release.orig/mailnews/mime/src/mimedrft.cpp comm-release/mailnews/mime/src/mimedrft.cpp
---- comm-release.orig/mailnews/mime/src/mimedrft.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/mime/src/mimedrft.cpp	2012-05-07 13:01:42.912022177 -0300
-@@ -1473,7 +1473,7 @@
-                 *newbody = 0;
-                 PL_strcatn(newbody, newbodylen, "<PRE>");
-                 PL_strcatn(newbody, newbodylen, body);
--                PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
-+                PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
-                 PR_Free(body);
-                 body = newbody;
-               }
-diff -Nur comm-release.orig/mailnews/mime/src/mimemult.cpp comm-release/mailnews/mime/src/mimemult.cpp
---- comm-release.orig/mailnews/mime/src/mimemult.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/mime/src/mimemult.cpp	2012-05-07 13:04:41.511265477 -0300
-@@ -280,7 +280,7 @@
-             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
-             MimeWriteAString(obj, fileName);
--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
-             MimeWriteAString(obj, obj->options->state->detachedFilePath);
-             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-@@ -293,10 +293,10 @@
-             status = MimeWriteAString(obj, header);
-             if (status < 0) 
-               return status;
--            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
-+            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
-             MimeWriteAString(obj, fileName);
--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
-           }
-           nsCString result;
-           char timeBuffer[128];
-@@ -306,8 +306,8 @@
-                                  "%a %b %d %H:%M:%S %Y",
-                                  &now);
-           MimeWriteAString(obj, nsDependentCString(timeBuffer));
--          MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
--          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
-+          MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-+          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
-           MimeHeaders_write_raw_headers(mult->hdrs, obj->options, PR_FALSE);
-         }
-         PRInt32 old_nchildren = container->nchildren;
diff --git a/libre/icedove-libre/gcc47.patch b/libre/icedove-libre/gcc47.patch
deleted file mode 100755
index 115d65131..000000000
--- a/libre/icedove-libre/gcc47.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-release/mozilla/ipc/chromium/src/base/file_util.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:38:11.474783536 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:43:29.218995578 +0000
-@@ -8,7 +8,7 @@
- #include <io.h>
- #endif
- #include <stdio.h>
--#if defined(ANDROID)
-+#if defined(ANDROID) || defined(OS_POSIX)
- #include <unistd.h>
- #endif
- 
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:38:11.381450924 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -5,6 +5,9 @@
- #include "base/file_util.h"
- 
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include <string>
- #include <vector>
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:38:11.438117153 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -6,6 +6,9 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:38:11.418117308 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -14,6 +14,8 @@
- #include <time.h>
- #endif
- 
-+#include <unistd.h>
-+
- #include <limits>
- 
- #include "base/basictypes.h"
-diff -Nur comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in comm-release/mozilla/toolkit/crashreporter/client/Makefile.in
---- comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:38:56.101105510 +0000
-+++ comm-release/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:43:29.218995578 +0000
-@@ -69,6 +69,9 @@
- $(STDCXX_COMPAT) \
- $(NULL)
- 
-+# Needed for moz_free
-+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
-+
- ifeq ($(OS_ARCH),WINNT)
- CPPSRCS += crashreporter_win.cpp
- LIBS += \
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index a3b46121f..01ea9167c 100755
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=liferea
 pkgname=liferea-libre
 pkgver=1.8.10
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
 url="http://liferea.sourceforge.net/"
diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install
index 3e1aa5820..7d812ccdb 100755
--- a/libre/liferea-libre/liferea.install
+++ b/libre/liferea-libre/liferea.install
@@ -1,7 +1,7 @@
-pkgname=liferea-libre
+pkgname=liferea
 
 post_install() {
-  usr/sbin/gconfpkg --install ${_pkgname}
+  usr/sbin/gconfpkg --install ${pkgname}
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -14,7 +14,7 @@ post_upgrade() {
 }
 
 pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${_pkgname}
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 64b57eed5..294c5afbf 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.6.4
+_kernver=3.6.5
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
 _pkgver=2012-10-03
 pkgver=20121003
-pkgrel=3
+pkgrel=4
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://linuxwireless.org/'
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 24a7919e1..ffda9f21f 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.49
+_kernver=3.0.50
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _pkgver=2012-10-03
 pkgver=20121003
-pkgrel=4
+pkgrel=5
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://linuxwireless.org/'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 1a0d031c1..1bcdb57fd 100755
--- 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=49
+_sublevel=50
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.48 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.49 # 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'
-         '29c9749f200e1679f52118b239fa4491'
+         '8c0723e49160ecd399205f9bbb8ee076'
          'aed25ab047e1c0b020a1516c235c6a74'
          '7d37e8ce0f4bd5a957172b12ae742ea0'
          'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         'e584ba40e137198ed196e58772838262')
+         'fba8d3ccd4a7e5b1132c9e20f60df1df')
 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 e718a1f5f..c961f9a99 100755
--- 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.49-1-LIBRE-LTS
+KERNEL_VERSION=3.0.50-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/PKGBUILD b/libre/linux-libre/PKGBUILD
index c48d12472..d5b44814f 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,7 +10,7 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.6
-_sublevel=4
+_sublevel=5
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
@@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.6.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a2312edd0265b5b07bd4b50afae2b380'
-         '71451d3fdb67db17581393a061bf9516'
+         'a126c193c6fbb3acff00c426493897df'
          'e4a3a4677e1fac6ecf0e0fb44c41ca08'
          '68fc36a4efb6ade0eca409b9444fef0c'
          'e49ac236dfeef709f91a3d993ea7b62c'
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 681b322af..30b5abc90 100755
--- 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.6.4-1-LIBRE
+KERNEL_VERSION=3.6.5-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/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index fb048355c..8292119d8 100755
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -1,8 +1,7 @@
-# $Id$
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgname=parabola-keyring
-pkgver=20121024
+pkgver=20121102
 pkgrel=1
 pkgdesc='Parabola GNU/Linux-libre PGP keyring'
 arch=('any')
@@ -16,5 +15,5 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
-md5sums=('7aebac7b4735117617f718058e0602f5'
-         '3b0183f30e786ea7197427199f9fa4f6')
+md5sums=('63c49a827ef05575514412ae76637c67'
+         '9b887e116a8e115a2ca082f65b3ea65a')
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index d5571465f..14ed8bdb1 100755
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165207 2012-08-13 08:28:02Z remy $
+# $Id: PKGBUILD 169309 2012-10-19 08:03:07Z eric $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: francois <francois.archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
 
 pkgname=texlive-bin-libre
 pkgver=2012.0
-pkgrel=4
+pkgrel=5
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')