icedove-libre{,-nonprism}-1:31.0.deb1-1: updating version

4 files changed, 22 insertions, 20 deletions

diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 61fb92709..04e11b5a3 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -3,8 +3,8 @@
 
 # We're getting this from Debian Sid
 _debname=icedove
-_debver=24.5.0
-_debrel=deb2
+_debver=31.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -18,7 +18,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
 url="http://packages.debian.org/sid/${_pkgname}"
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt' 'jquery-ui')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' 'autoconf2.13' 'quilt' 'jquery-ui')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
 conflicts=('thunderbird')
@@ -30,14 +30,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         vendor.js
         ${_pkgname}.desktop)
 options=(!emptydirs)
-md5sums=('f5fdb857b1da3e7419acbd5922b4966d'
-         '051ee07e7ca1f28b114e60524a7f72d2'
-         'c46cf2a671c8fdefcabd4c87e38f3d40'
+md5sums=('1ea1f4340b1ab29a29aed74f4d6197bd'
+         '95d95340ba614657a22298dea97886b6'
+         '5f2297712c3dab7b15d7d5c8a6fa22d2'
          '5a53179d14ae9631b7afe5e4d0fc0b25'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
 
 prepare() {
-  export DEBIAN_BUILD="comm-esr24"
+  export DEBIAN_BUILD="comm-esr31"
 
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
@@ -99,7 +99,7 @@ prepare() {
 }
 
 build() {
-  export DEBIAN_BUILD="comm-esr24"
+  export DEBIAN_BUILD="comm-esr31"
 
   cd "${srcdir}/${DEBIAN_BUILD}"
 
@@ -110,7 +110,7 @@ build() {
 }
 
 package() {
-  export DEBIAN_BUILD="comm-esr24"
+  export DEBIAN_BUILD="comm-esr31"
 
   cd "${srcdir}/${DEBIAN_BUILD}"
 
@@ -132,5 +132,5 @@ package() {
   ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins"
 
   # We don't want the development stuff
-  rm -r "${pkgdir}"/usr/{include,lib/${_pkgname}-devel,share/idl}
+  rm -r "${pkgdir}"/usr/{include,lib/${_pkgname}-devel-*,share/idl}
 }
diff --git a/libre/icedove-libre/mozconfig b/libre/icedove-libre/mozconfig
index 57c02368a..3987c2c5a 100644
--- a/libre/icedove-libre/mozconfig
+++ b/libre/icedove-libre/mozconfig
@@ -35,6 +35,7 @@ ac_add_options --disable-updater
 ac_add_options --disable-tests
 ac_add_options --disable-mochitest
 ac_add_options --disable-installer
+ac_add_options --disable-debug-symbols
 
 # Optimization
 ac_add_options --enable-optimize
diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD
index 8aca600e8..3ef22dec2 100644
--- a/nonprism/icedove-libre-nonprism/PKGBUILD
+++ b/nonprism/icedove-libre-nonprism/PKGBUILD
@@ -3,8 +3,8 @@
 
 # We're getting this from Debian Sid
 _debname=icedove
-_debver=24.5.0
-_debrel=deb2
+_debver=31.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -18,7 +18,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
 url="http://packages.debian.org/sid/${_pkgname}"
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt' 'jquery-ui')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' 'autoconf2.13' 'quilt' 'jquery-ui')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird' "${pkgname%-nonprism}")
 conflicts=('thunderbird' "${pkgname%-nonprism}")
@@ -30,14 +30,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         vendor.js
         ${_pkgname}.desktop)
 options=(!emptydirs)
-md5sums=('f5fdb857b1da3e7419acbd5922b4966d'
-         '051ee07e7ca1f28b114e60524a7f72d2'
-         'c46cf2a671c8fdefcabd4c87e38f3d40'
+md5sums=('1ea1f4340b1ab29a29aed74f4d6197bd'
+         '95d95340ba614657a22298dea97886b6'
+         '5f2297712c3dab7b15d7d5c8a6fa22d2'
          '5a53179d14ae9631b7afe5e4d0fc0b25'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
 
 prepare() {
-  export DEBIAN_BUILD="comm-esr24"
+  export DEBIAN_BUILD="comm-esr31"
 
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
@@ -113,7 +113,7 @@ prepare() {
 }
 
 build() {
-  export DEBIAN_BUILD="comm-esr24"
+  export DEBIAN_BUILD="comm-esr31"
 
   cd "${srcdir}/${DEBIAN_BUILD}"
 
@@ -124,7 +124,7 @@ build() {
 }
 
 package() {
-  export DEBIAN_BUILD="comm-esr24"
+  export DEBIAN_BUILD="comm-esr31"
 
   cd "${srcdir}/${DEBIAN_BUILD}"
 
@@ -146,5 +146,5 @@ package() {
   ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins"
 
   # We don't want the development stuff
-  rm -r "${pkgdir}"/usr/{include,lib/${_pkgname}-devel,share/idl}
+  rm -r "${pkgdir}"/usr/{include,lib/${_pkgname}-devel-*,share/idl}
 }
diff --git a/nonprism/icedove-libre-nonprism/mozconfig b/nonprism/icedove-libre-nonprism/mozconfig
index 57c02368a..3987c2c5a 100644
--- a/nonprism/icedove-libre-nonprism/mozconfig
+++ b/nonprism/icedove-libre-nonprism/mozconfig
@@ -35,6 +35,7 @@ ac_add_options --disable-updater
 ac_add_options --disable-tests
 ac_add_options --disable-mochitest
 ac_add_options --disable-installer
+ac_add_options --disable-debug-symbols
 
 # Optimization
 ac_add_options --enable-optimize