update ~lukeshu/iceweasel-libre-current teach it how to create icewasel-9.0.1.tar.gz itself

1 files changed, 29 insertions, 6 deletions

diff --git a/~lukeshu/iceweasel-libre-current/PKGBUILD b/~lukeshu/iceweasel-libre-current/PKGBUILD
index 2184d9d77..89fd91443 100644
--- a/~lukeshu/iceweasel-libre-current/PKGBUILD
+++ b/~lukeshu/iceweasel-libre-current/PKGBUILD
@@ -1,23 +1,29 @@
 # Maintainer: Henry Jensen <hjensen@connochaetos.org>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-pkgname=iceweasel-libre-current
 _pkgname=iceweasel
-pkgver=9.0.1
 _pkgver=9.0
+_debver=9.0.1
+_debrel='1~bpo60+1' # bpo=backport (from sid to sqeeze)
+_repo_url=http://mozilla.debian.net/pool/iceweasel-release/i/iceweasel
 
+pkgname=$_pkgname-libre-current
+pkgver=${_debver}.${_debrel}
 pkgrel=1
+
 pkgdesc="Libre version of Iceweasel, based on the Firefox browser."
 arch=('i586' 'i686' 'x86_64')
 url="http://www.geticeweasel.org/"
 license=('GPL2' 'MPL' 'LGPL')
 depends=('desktop-file-utils')
-makedepends=('zip' 'pkg-config' 'diffutils' 'python' 'wireless_tools' 'yasm' 'mesa')
+makedepends=('zip' 'pkg-config' 'diffutils' 'python' 'wireless_tools' 'yasm' 'mesa' 'quilt')
 provides=("${_pkgname}")
 conflicts=('firefox' 'icecat' "${_pkgname}")
 replaces=('firefox' 'icecat')
 install=iceweasel.install
-source=(iceweasel-${pkgver}.tar.gz::https://repo.parabolagnulinux.org/other/iceweasel-${pkgver}-connos.tar.gz
+source=("${_repo_url}/iceweasel_${_debver}.orig.tar.bz2"
+        "${_repo_url}/iceweasel_${_debver}-${_debrel}.debian.tar.gz"
+        # Misc
         mozconfig
         mozilla-firefox-1.0-lang.patch
         xulrunner-copy-stub.patch
@@ -36,7 +42,23 @@ source=(iceweasel-${pkgver}.tar.gz::https://repo.parabolagnulinux.org/other/icew
         region.properties)
 
 build() {
-  msg2 "Patching some files..."
+  msg2 "Applying Debian patches..."
+  cd "${srcdir}"
+  # This will simulate dpkg-source -x iceweasel_${_debver}-${_debrel}.dsc
+  export QUILT_PATCHES=debian/patches
+  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
+  export QUILT_DIFF_ARGS='--no-timestamps'
+  mv mozilla-release "${_pkgname}-${_debver}"
+  mv debian "${_pkgname}-${_debver}"
+  cd "${_pkgname}-${_debver}"
+  quilt push -a
+  find .pc -name .timestamp -delete # why isn't --no-timestamps doing this?
+
+  # This will make life more sane
+  cd "${srcdir}"
+  ln -s "${_pkgname}-${_debver}" "${_pkgname}-${pkgver}"
+
+  msg2 "Applying Parabola/ConnochaetOS patches..."
   cd "${srcdir}/${_pkgname}-${pkgver}/"
   patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
   patch -p1 < ../libre.patch
@@ -87,7 +109,8 @@ package() {
   rm -rvf ${pkgdir}/usr/include
 
 }
-md5sums=('a1e4a5d09f3dc24b936eadc8c5bae7a8'
+md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'
+         '8846b9cce4ce7a82ec9995510efce867'
          '5e2574eef71ee1437e2f8e7481c67893'
          'bd5db57c23c72a02a489592644f18995'
          '5a1938673a367b20ecfa009a5eb767aa'