From 8a2a2743fd88a01b77ba1caab4d28b6845f654bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <apoyosis@correo.inta.gob.ar>
Date: Mon, 6 Feb 2012 18:29:38 -0300
Subject: mozilla-testing/iceweasel-libre-10.0-1

Remove the yandex patch because it makes quilt fail (and looks unimportant).
Still fails to apply libre.patch.
---
 mozilla-testing/iceweasel-libre/PKGBUILD | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'mozilla-testing')

diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD
index 9ade92f8b..f601af07a 100644
--- a/mozilla-testing/iceweasel-libre/PKGBUILD
+++ b/mozilla-testing/iceweasel-libre/PKGBUILD
@@ -12,15 +12,15 @@ _pgo=false
 
 # We're getting this from Debian Sid
 _debname=iceweasel
-_debver=9.0.1
-_debrel=1
+_debver=10.0
+_debrel=2
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=2.1
+pkgrel=1
 
 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
 if $_pgo; then
@@ -81,6 +81,16 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         iceweasel-install-dir.patch
         region.properties
         vendor.js)
+md5sums=('bc86bf0d74649f9b3fcde6dfa914141e'
+         '131782b1ca9d24f40dff8f456558988d'
+         '659b08b8f14429dd1b7f9229b6fbd1b2'
+         'eab149c1994ab14392e55af3abb08e80'
+         'ac29b01c189f20abae2f3eef1618ffc0'
+         'a485a2b5dc544a8a2bd40c985d2e5813'
+         '3c1a7d6984b47a0ab36a5d8e6672cb2b'
+         'e529742c0a425648087bc3ce537fe4c5'
+         'f1c76e7e244257856a386ca2de69bdf0'
+         '0d053487907de4376d67d8f499c5502b')
 
 if [ "$_pkgname" != "$pkgname" ]; then
   provides+=("$_pkgname=$pkgver")
@@ -95,7 +105,10 @@ dpkg-source() {
   mv mozilla-release "${_debname}-${_debver}"
   mv debian "${_debname}-${_debver}"
   cd "${_debname}-${_debver}"
-  quilt push -a
+
+  rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
+
+  quilt push -af
   find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
   cd ..
 }
@@ -168,13 +181,3 @@ package() {
   ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
 }
 
-md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'
-         '6cde9fe38df1434fdcc0f3a078b0238e'
-         'd9b5f2a893ad80da492aec8c9a7cbb7c'
-         'eab149c1994ab14392e55af3abb08e80'
-         'ac29b01c189f20abae2f3eef1618ffc0'
-         'a485a2b5dc544a8a2bd40c985d2e5813'
-         '3c1a7d6984b47a0ab36a5d8e6672cb2b'
-         'e529742c0a425648087bc3ce537fe4c5'
-         'f1c76e7e244257856a386ca2de69bdf0'
-         '0d053487907de4376d67d8f499c5502b')
-- 
cgit v1.2.3-2-g168b