Make the iceweasel pkgbuilds have a separate dpkg-source()

In order to make them more debian-ish.

3 files changed, 34 insertions, 11 deletions

diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD b/mozilla-testing/iceweasel-i18n/PKGBUILD
index eb4b72af7..8a744f7a5 100644
--- a/mozilla-testing/iceweasel-i18n/PKGBUILD
+++ b/mozilla-testing/iceweasel-i18n/PKGBUILD
@@ -1,4 +1,7 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: Figue <ffigue@gmail.com>
+# Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
 # - Edit variables in in Makefile.
@@ -27,16 +30,22 @@ url="http://www.geticeweasel.org/"
 license=('MPL')
 depends=("iceweasel=${_pkgver}")
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz")
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")
 noextract=($(for lang in ${_langpacks[@]}
         do echo $lang.xpi
         done))
 
-build() {
-  cd "${srcdir}"
+dpkg-source() {
   # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
   cd "${_debname}-${_debver}"
   patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff"
+  cd ..
+}
+
+build() {
+  cd "${srcdir}"
+  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
 }
 
 _path="/usr/lib/iceweasel-${_pkgver}/extensions"
@@ -52,4 +61,5 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () {
 done
 
 md5sums=('d0dc0653b9d7642e6d346b54fb1782ae'
-         '493920a716fa40daeb5bd8cdfdbfe6a6')
+         '493920a716fa40daeb5bd8cdfdbfe6a6'
+         'd03f6db3a354e9208500898738506e50')
diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD.in b/mozilla-testing/iceweasel-i18n/PKGBUILD.in
index a912414b8..691c80c0e 100644
--- a/mozilla-testing/iceweasel-i18n/PKGBUILD.in
+++ b/mozilla-testing/iceweasel-i18n/PKGBUILD.in
@@ -30,16 +30,22 @@ url="http://www.geticeweasel.org/"
 license=('MPL')
 depends=("iceweasel=${_pkgver}")
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz")
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")
 noextract=($(for lang in ${_langpacks[@]}
         do echo $lang.xpi
         done))
 
-build() {
-  cd "${srcdir}"
+dpkg-source() {
   # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
   cd "${_debname}-${_debver}"
   patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff"
+  cd ..
+}
+
+build() {
+  cd "${srcdir}"
+  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
 }
 
 _path="/usr/lib/iceweasel-${_pkgver}/extensions"
diff --git a/mozilla-testing/iceweasel/PKGBUILD b/mozilla-testing/iceweasel/PKGBUILD
index 992476d43..e7f9d4d84 100644
--- a/mozilla-testing/iceweasel/PKGBUILD
+++ b/mozilla-testing/iceweasel/PKGBUILD
@@ -53,6 +53,7 @@ options=(!buildflags !distcc)
 install=iceweasel.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc"
         mozconfig
         libre.patch
         # Default configuration
@@ -60,9 +61,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         xulrunner-copy-stub.patch
         region.properties)
 
-build() {
-  msg2 "Applying Debian patches..."
-  cd "${srcdir}"
+dpkg-source() {
   # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
@@ -71,7 +70,14 @@ build() {
   mv debian "${_debname}-${_debver}"
   cd "${_debname}-${_debver}"
   quilt push -a
-  find .pc -name .timestamp -delete # why isn't --no-timestamps doing this?
+  find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
+  cd ..
+}
+
+build() {
+  msg2 "Applying Debian patches..."
+  cd "${srcdir}"
+  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
 
   # This will make life more sane
   cd "${srcdir}"
@@ -128,6 +134,7 @@ package() {
 
 md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'
          '6cde9fe38df1434fdcc0f3a078b0238e'
+         'd9b5f2a893ad80da492aec8c9a7cbb7c'
          '5e2574eef71ee1437e2f8e7481c67893'
          '9609e77182cc300e3fe9d4b0c7e7efb4'
          'bd5db57c23c72a02a489592644f18995'