3 files changed, 15 insertions, 6 deletions
diff --git a/mozilla-testing/iceweasel-i18n/Makefile b/mozilla-testing/iceweasel-i18n/Makefile
index 64e140af6..d596111f3 100644
--- a/mozilla-testing/iceweasel-i18n/Makefile
+++ b/mozilla-testing/iceweasel-i18n/Makefile
@@ -13,7 +13,7 @@ debrel=1
 debrepo=http://ftp.debian.org/debian/pool/main/
 
 pkgver=9.0
-pkgrel=2
+pkgrel=2.1
 
 # Guts: ##############################################################
 
diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD b/mozilla-testing/iceweasel-i18n/PKGBUILD
index 8a744f7a5..fd56f38bb 100644
--- a/mozilla-testing/iceweasel-i18n/PKGBUILD
+++ b/mozilla-testing/iceweasel-i18n/PKGBUILD
@@ -14,6 +14,7 @@ _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
+# echo $(ls src/iceweasel-l10n-*+debian/upstream/ | sed 's/\.xpi/ /')
 _langpacks=(af ak ar ast as be bg bn-BD bn-IN br bs ca cs cy da de dz-BT el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa-IR fa fi fr fur-IT fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja ka kk kn ko ku lg lt lv mai mk ml mn mr nb-NO ne-NP nl nn-NO nso oc or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
 
 pkgbase=iceweasel-i18n
@@ -22,13 +23,14 @@ pkgname=($(for lang in ${_langpacks[@]}
         done))
 _pkgver=9.0
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=2.1
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
 url="http://www.geticeweasel.org/"
 license=('MPL')
-depends=("iceweasel=${_pkgver}")
+depends=("iceweasel-libre>=$_pkgver")
+makedepends=("mozilla-devscripts" "xmlstarlet")
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")
@@ -46,16 +48,23 @@ dpkg-source() {
 build() {
   cd "${srcdir}"
   dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+  patch -Np0 -i ${_debname}_${_debver}-${_debrel}.diff
+  cd ${_debname}-${_debver}
+  # Fix broken files or avoid unnecessary dependencies.
+  sed -i 's/$TARGET/$TARGET ; exit/' debian/build-script.sh
+  # Langpacks initially state to support exactly one browser version,
+  # Debian fixes this.
+  sh debian/build-script.sh override_dh_auto_build 9 21
 }
 
-_path="/usr/lib/iceweasel-${_pkgver}/extensions"
+_path="/usr/lib/iceweasel/extensions"
 
 
 for lang in ${_langpacks[@]}
 do
     eval "
 package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () {
-  install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
+  install -Dm644 '$srcdir/'*'/build/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
 }
 "
 done
diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD.in b/mozilla-testing/iceweasel-i18n/PKGBUILD.in
index 691c80c0e..05477caef 100644
--- a/mozilla-testing/iceweasel-i18n/PKGBUILD.in
+++ b/mozilla-testing/iceweasel-i18n/PKGBUILD.in
@@ -28,7 +28,7 @@ pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
 url="http://www.geticeweasel.org/"
 license=('MPL')
-depends=("iceweasel=${_pkgver}")
+depends=("iceweasel=$_pkgver")
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")