apply Debian patches

2 files changed, 13 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 21411b115cfc..cbd50c571bce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Apr 23 09:23:45 UTC 2017
 pkgbase = monotone
 	pkgdesc = A free distributed version control system
 	pkgver = 1.1
-	pkgrel = 5
+	pkgrel = 6
 	url = http://www.monotone.ca/
 	arch = i686
 	arch = x86_64
@@ -16,7 +14,9 @@ pkgbase = monotone
 	depends = libidn
 	depends = zlib
 	source = http://www.monotone.ca/downloads/1.1/monotone-1.1.tar.bz2
+	source = http://http.debian.net/debian/pool/main/m/monotone/monotone_1.1-9.debian.tar.xz
 	sha256sums = f95cf60a22d4e461bec9d0e72f5d3609c9a4576fb1cc45f553d0202ce2e38c88
+	sha256sums = 70a4e8fed56f4734de2192990db5e20fe8a8b819af51780df3d78310ee9eeeda
 
 pkgname = monotone
 
diff --git a/PKGBUILD b/PKGBUILD
index d32043e04825..d9960e0e6f99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,18 +7,25 @@
 
 pkgname=monotone
 pkgver=1.1
-pkgrel=5
+pkgrel=6
 pkgdesc='A free distributed version control system'
 arch=('i686' 'x86_64')
 url='http://www.monotone.ca/'
 license=('GPL')
 depends=('pcre' 'lua' 'botan1.10' 'sqlite3' 'libidn' 'zlib')
 makedepends=('boost')
-source=("http://www.monotone.ca/downloads/1.1/monotone-${pkgver}.tar.bz2")
-sha256sums=('f95cf60a22d4e461bec9d0e72f5d3609c9a4576fb1cc45f553d0202ce2e38c88')
+source=("http://www.monotone.ca/downloads/1.1/monotone-${pkgver}.tar.bz2"
+        "http://http.debian.net/debian/pool/main/m/monotone/monotone_1.1-9.debian.tar.xz")
+sha256sums=('f95cf60a22d4e461bec9d0e72f5d3609c9a4576fb1cc45f553d0202ce2e38c88'
+            '70a4e8fed56f4734de2192990db5e20fe8a8b819af51780df3d78310ee9eeeda')
 
 prepare() {
   cd "$srcdir/${pkgname}-${pkgver}"
+  for _f in $(< ../debian/patches/series); do
+    msg2 "Applying $_f"
+    patch -Np1 < ../debian/patches/$_f
+  done
+  msg2 "Bootstrapping autoconf"
   aclocal
   autoreconf --install
 }