v0.0.21

3 files changed, 14 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3994ed29261d..3a1f79974294 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sensible-utils
 	pkgdesc = Utilities for sensible alternative selection
-	pkgver = 0.0.20
-	pkgrel = 6
+	pkgver = 0.0.21
+	pkgrel = 1
 	url = http://packages.debian.org/source/sid/sensible-utils
 	arch = any
 	license = GPL
@@ -10,15 +10,13 @@ pkgbase = sensible-utils
 	makedepends = findutils
 	depends = bash
 	depends = coreutils
-	source = sensible-utils_0.0.20_.tar.xz::http://ftp.debian.org/debian/pool/main/s/sensible-utils/sensible-utils_0.0.20.tar.xz
-	source = sensible-utils_0.0.20_.dsc::http://ftp.debian.org/debian/pool/main/s/sensible-utils/sensible-utils_0.0.20.dsc
-	source = 0001-no-fork-bomb-test.patch
+	source = sensible-utils_0.0.21_.tar.xz::http://ftp.debian.org/debian/pool/main/s/sensible-utils/sensible-utils_0.0.21.tar.xz
+	source = sensible-utils_0.0.21_.dsc::http://ftp.debian.org/debian/pool/main/s/sensible-utils/sensible-utils_0.0.21.dsc
 	source = sensible-utils.install
 	source = sensible-envvars
 	validpgpkeys = 5D0187B940A245BAD7B0F56A003A1A2DAA41085F
-	b2sums = e65419e7f157f64249b429806a4d48c02c5f492fb2dbdae1a8e4966dca964a4b1b9b6fdb555f03fabb6cd219238022821a64b15f11582ffdf115fa15ab6e3e0e
-	b2sums = 8b122921916df3f4c138b99ac5183cae686e01be985db0ad2c77e3faff619779aecc596c6936c9f73f73ff3c73cf5ce30654df9158ce15caccd4ed0e0f50de09
-	b2sums = 5d49350d8dafe08380eac326c9951fc24065ab0d867258112d28f4ca5c39170766600aa11c612c074ced4b5e35be59018aeb5a1d638a3dd51ade7d0f0f6d5bc0
+	b2sums = 3540965529583afe60f7abb9eade22c9f06f7d5dc4d266bfad35c0a33337db341fff2f3e59e25e1c53fb845c9f4e4d1587f0215000fdd3ba9f499ed35d9f7ef9
+	b2sums = da806a63d4fe66f341564d8edaaa7669acf181c57595baf0be9eb33d1c2a0554aa0faa18e0449840d8b5941b592359e937cc0ba79a96a1fa276828a9b05c1181
 	b2sums = c39a760655833d374dc606894452c997bd86a1645c0b5496c5546364cac07ad4205c8dae05f457bd31a210bfd4d290fbcb71cdcf584df857e93c851b384bba81
 	b2sums = 8a213b98cc6d432af30ecf58d91ae88f151f2824274702f7e1bde6119b45effc4a0b15907459c9f8f1ee5af94de862e6dec579b4f07d168aaa658443764a1f19
 
diff --git a/0001-no-fork-bomb-test.patch b/0001-no-fork-bomb-test.patch
deleted file mode 100644
index 84ba4fce8117..000000000000
--- a/0001-no-fork-bomb-test.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-6c6
-< TESTS = test/ed-as-sensible-editor test/echo-as-browser  test/ed-as-visual test/ed-as-fallback test/error-out test/fork-bomb test/shell-script test/failure-propagation test/echo-as-pager
----
-> TESTS = test/ed-as-sensible-editor test/echo-as-browser  test/ed-as-visual test/ed-as-fallback test/error-out test/shell-script test/failure-propagation test/echo-as-pager
diff --git a/PKGBUILD b/PKGBUILD
index 11cb59a0d95c..532b6552cb49 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,9 +7,9 @@ pkgbase=sensible-utils
 pkgname=(sensible-utils sensible-browser sensible-editor sensible-pager sensible-terminal sensible-utils-data)
 # This is the above minus the pkgbase name, for use in sensible-utils packaging command.
 _pkgname=(sensible-browser sensible-editor sensible-pager sensible-terminal sensible-utils-data)
-pkgver=0.0.20
+pkgver=0.0.21
 _debianextra='' # Do not remove even if empty as sometimes Debian puts e.g. +1, their version of a pkgrel.
-pkgrel=6
+pkgrel=1
 pkgdesc="Utilities for sensible alternative selection"
 arch=('any')
 url="http://packages.debian.org/source/sid/sensible-utils"
@@ -22,41 +22,34 @@ checkdepends=('ed')
 _dirname=${pkgbase}_${pkgver}_$pkgrel_${_debianextra}
 source=("$_dirname.tar.xz::http://ftp.debian.org/debian/pool/main/s/$pkgbase/${pkgbase}_${pkgver}${_debianextra}.tar.xz"
         "$_dirname.dsc::http://ftp.debian.org/debian/pool/main/s/$pkgbase/${pkgbase}_${pkgver}${_debianextra}.dsc"
-        0001-no-fork-bomb-test.patch
         sensible-utils.install
         sensible-envvars)
 # (n)vim command to regenerate:
 # :'<,'>! makepkg --geninteg 2>&1 | perl -pe '$_=~s/^[\s]*(==>|->).*//g; $_=~s/^[\s]*$//d'
-b2sums=('e65419e7f157f64249b429806a4d48c02c5f492fb2dbdae1a8e4966dca964a4b1b9b6fdb555f03fabb6cd219238022821a64b15f11582ffdf115fa15ab6e3e0e'
-        '8b122921916df3f4c138b99ac5183cae686e01be985db0ad2c77e3faff619779aecc596c6936c9f73f73ff3c73cf5ce30654df9158ce15caccd4ed0e0f50de09'
-        '5d49350d8dafe08380eac326c9951fc24065ab0d867258112d28f4ca5c39170766600aa11c612c074ced4b5e35be59018aeb5a1d638a3dd51ade7d0f0f6d5bc0'
+b2sums=('3540965529583afe60f7abb9eade22c9f06f7d5dc4d266bfad35c0a33337db341fff2f3e59e25e1c53fb845c9f4e4d1587f0215000fdd3ba9f499ed35d9f7ef9'
+        'da806a63d4fe66f341564d8edaaa7669acf181c57595baf0be9eb33d1c2a0554aa0faa18e0449840d8b5941b592359e937cc0ba79a96a1fa276828a9b05c1181'
         'c39a760655833d374dc606894452c997bd86a1645c0b5496c5546364cac07ad4205c8dae05f457bd31a210bfd4d290fbcb71cdcf584df857e93c851b384bba81'
         '8a213b98cc6d432af30ecf58d91ae88f151f2824274702f7e1bde6119b45effc4a0b15907459c9f8f1ee5af94de862e6dec579b4f07d168aaa658443764a1f19')
 # Bastien ROUCARIÈS <rouca@debian.org>
 validpgpkeys=('5D0187B940A245BAD7B0F56A003A1A2DAA41085F')
 
-prepare() {
-  cd ${pkgbase}-${pkgver}${_debianextra}
-  rm test/fork-bomb
-}
-
 build() {
-  cd ${pkgbase}-${pkgver}${_debianextra}
+  cd ${pkgbase}
   export -n EDITOR VISUAL PAGER TERMINAL_EMULATOR BROWSER
   ./configure --prefix=/usr
-  patch Makefile ../0001-no-fork-bomb-test.patch
+  find .. -type f -and -name '*.patch' -print0 | xargs -0r patch -p1
   make
 }
 
 # This trick is needed as the fork-bomb test only works if /bin/sh == /bin/dash,
 # which it isn't on Arch but is on Debian!
 check() {
-  cd ${pkgbase}-${pkgver}${_debianextra}
+  cd ${pkgbase}
   env -i make check
 }
 
 _package_sensible() {
-  cd ${pkgbase}-${pkgver}${_debianextra}
+  cd ${pkgbase}
   pkgdesc="$pkgdesc (${pkgname##*-})"
   export -n EDITOR VISUAL PAGER TERMINAL_EMULATOR BROWSER
   make DESTDIR="$pkgdir/" install