From 52918993de865c5c687cf6bedfb6d2409d9910dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Thu, 2 Apr 2015 16:01:19 -0300
Subject: icedove-1:31.6.0.deb1-1{,.nonprism1}: updating version

---
 libre/icedove/PKGBUILD    |  9 +++------
 nonprism/icedove/PKGBUILD | 11 +++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index 0f5225304..3ef3bb3e3 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Sid
 _debname=icedove
-_debver=31.5.0
+_debver=31.6.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -31,8 +31,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         vendor.js
         rhbz-966424.patch)
 options=(!emptydirs)
-sha256sums=('effadaefbb224c72415d7e53afb7ab6046cd56155fc4dce4346b71b9db4fc23f'
-            'cd4d6944c188ec87b1346a4a908bbd3dd694928f3d78a1c90ba73947a13b5b4f'
+sha256sums=('9011da6632434d6ee991cc69f4e040a194d998ce3a04e5c3a05f21fc361124dc'
+            'ac73365adcccf126b97432cfd60828da667b2eb82512ae252cf577939d666fd9'
             '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a'
             'a0be56fc87f255804e00e7c85abbc4731ebdaa8938858f1f8ac47dd2f17c0b8b'
             '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d'
@@ -59,9 +59,6 @@ prepare() {
       install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/content/icon${i/x*/}.png"
   done
 
-  # Fix orthographic issue ("Icdove" to "Icedove") in MOZ_APP_BASENAME line for confvars.sh.
-  sed -i 's|Icdove|Icedove|' debian/patches/debian-hacks/Icedove-branding.patch
-
   quilt push -av
 
   # Fix paths on makefile
diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index 02f47cd45..5d074331e 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Sid
 _debname=icedove
-_debver=31.5.0
+_debver=31.6.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -31,8 +31,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         vendor.js
         rhbz-966424.patch)
 options=(!emptydirs)
-sha256sums=('effadaefbb224c72415d7e53afb7ab6046cd56155fc4dce4346b71b9db4fc23f'
-            'cd4d6944c188ec87b1346a4a908bbd3dd694928f3d78a1c90ba73947a13b5b4f'
+sha256sums=('9011da6632434d6ee991cc69f4e040a194d998ce3a04e5c3a05f21fc361124dc'
+            'ac73365adcccf126b97432cfd60828da667b2eb82512ae252cf577939d666fd9'
             '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a'
             'a0be56fc87f255804e00e7c85abbc4731ebdaa8938858f1f8ac47dd2f17c0b8b'
             '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d'
@@ -59,9 +59,6 @@ prepare() {
       install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/content/icon${i/x*/}.png"
   done
 
-  # Fix orthographic issue ("Icdove" to "Icedove") in MOZ_APP_BASENAME line for confvars.sh.
-  sed -i 's|Icdove|Icedove|' debian/patches/debian-hacks/Icedove-branding.patch
-
   quilt push -av
 
   # Fix paths on makefile
@@ -93,7 +90,9 @@ prepare() {
   # Remove support for unsafe and dangerous for privacy protocols
   sed -i '\|facebook|d
           \|gtalk|d
+          \|odnoklassniki|d
           \|twitter|d
+          \|yahoo|d
          ' chat/moz.build
   sed -i '\|facebook[.]js|d
           \|facebook[.]manifest|d
-- 
cgit v1.2.3-2-g168b