v0.0.19

6 files changed, 73 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6444904b649b..0918e2f60c6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,31 @@
 pkgbase = sensible-utils
 	pkgdesc = Utilities for sensible alternative selection
-	pkgver = 0.0.17
-	pkgrel = 3
+	pkgver = 0.0.19
+	pkgrel = 1
 	url = http://packages.debian.org/source/sid/sensible-utils
 	arch = any
 	license = GPL
 	checkdepends = ed
 	makedepends = po4a
 	depends = bash
-	source = http://ftp.debian.org/debian/pool/main/s/sensible-utils/sensible-utils_0.0.17+nmu1.tar.xz
-	sha256sums = a4ead62e0dc8f965453221dcb09c964abc4f1bedad24f527d33c443a1570cb31
+	depends = coreutils
+	provides = sensible-pager
+	provides = sensible-editor
+	provides = sensible-browser
+	conflicts = sensible-pager
+	conflicts = sensible-editor
+	conflicts = sensible-browser
+	source = http://ftp.debian.org/debian/pool/main/s/sensible-utils/sensible-utils_0.0.19.tar.xz
+	source = http://ftp.debian.org/debian/pool/main/s/sensible-utils/sensible-utils_0.0.19.dsc
+	source = 0001-no-fork-bomb-test.patch
+	source = sensible-utils_0.0.19.dsc.sig
+	source = sensible-utils_0.0.19.tar.xz.sig
+	validpgpkeys = 98F28F767470129FBE3B054CE2154DD1A1C77B8B
+	sha256sums = 3af5fe874c9e643b3d413d4f1b71009194c9093225e9dd49de86e2e604721d69
+	sha256sums = 758218a18c89964da1b2bcfb1e457949ef4e9ccc18a5b9061bb547b617167e1b
+	sha256sums = 063c12d9dfb193f94ded0de3384a78a463c72d0fb1eb3b8edbafe418efaebc46
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = sensible-pager
 
diff --git a/0001-no-fork-bomb-test.patch b/0001-no-fork-bomb-test.patch
new file mode 100644
index 000000000000..84ba4fce8117
--- /dev/null
+++ b/0001-no-fork-bomb-test.patch
@@ -0,0 +1,4 @@
+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/0001-no-fork-bomb-test.patch.sig b/0001-no-fork-bomb-test.patch.sig
new file mode 100644
index 000000000000..c4f9e1e96069
--- /dev/null
+++ b/0001-no-fork-bomb-test.patch.sig
diff --git a/PKGBUILD b/PKGBUILD
index a50099725b9b..3dbcf14e113e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,36 @@
 # Contributor: Brian BIdulock <bidulock@openss7.org>
 pkgbase=sensible-utils
 pkgname=(sensible-pager sensible-editor sensible-browser sensible-utils-data)
-pkgver=0.0.17
-_debianextra=+nmu1
-pkgrel=3
+pkgver=0.0.19
+_debianextra=''
+pkgrel=1
 pkgdesc="Utilities for sensible alternative selection"
 arch=('any')
 url="http://packages.debian.org/source/sid/sensible-utils"
 license=('GPL')
-depends=('bash')
+depends=('bash' 'coreutils')
+provides=(sensible-pager sensible-editor sensible-browser)
+conflicts=(sensible-pager sensible-editor sensible-browser)
 makedepends=('po4a')
 checkdepends=('ed')
-source=(http://ftp.debian.org/debian/pool/main/s/$pkgbase/${pkgbase}_${pkgver}${_debianextra}.tar.xz)
-sha256sums=('a4ead62e0dc8f965453221dcb09c964abc4f1bedad24f527d33c443a1570cb31')
+source=("http://ftp.debian.org/debian/pool/main/s/$pkgbase/${pkgbase}_${pkgver}${_debianextra}.tar.xz"
+        "http://ftp.debian.org/debian/pool/main/s/$pkgbase/${pkgbase}_${pkgver}${_debianextra}.dsc"
+        "0001-no-fork-bomb-test.patch"
+        "sensible-utils_0.0.19.dsc.sig"
+        "sensible-utils_0.0.19.tar.xz.sig")
+sha256sums=('3af5fe874c9e643b3d413d4f1b71009194c9093225e9dd49de86e2e604721d69'
+            '758218a18c89964da1b2bcfb1e457949ef4e9ccc18a5b9061bb547b617167e1b'
+            '063c12d9dfb193f94ded0de3384a78a463c72d0fb1eb3b8edbafe418efaebc46'
+            'SKIP'
+            'SKIP')
+validpgpkeys=('98F28F767470129FBE3B054CE2154DD1A1C77B8B')
+
+prepare() {
+  pushd ${pkgbase}-${pkgver}${_debianextra}
+  OPWD="$PWD"
+  popd
+  patch -p0 "$OPWD/Makefile.am" < 0001-no-fork-bomb-test.patch
+}
 
 build() {
   cd ${pkgbase}-${pkgver}${_debianextra}
@@ -23,40 +41,54 @@ build() {
   make
 }
 
+build_sensible-utils() {
+  exit 0
+}
+
 check() {
   cd ${pkgbase}-${pkgver}${_debianextra}
-  export -n EDITOR VISUAL
-  make -k check
+  bash -c 'make -k check'
 }
 
 _package_sensible() {
   cd ${pkgbase}-${pkgver}${_debianextra}
+  pkgdesc="$pkgdesc (${pkgname##*-})"
+  provides=()
+  conflicts=()
+  depends+=(sensible-utils-data)
+  [ "$pkgname" != sensible-utils-data ] && provides=($pkgname)
+  [ "$pkgname" != sensible-utils-data ] && conflicts=($pkgname)
+  [ "$pkgname" == sensible-utils-data ] && depends=(bash)
   export -n EDITOR VISUAL
   make DESTDIR="$pkgdir/" install
   shopt -s globstar
-  cd $pkgdir
-  [[ $CURRENTLY_PACKAGING = sensible-utils ]] && return 0
+  cd "$pkgdir"
   find . -type f -and \( -not -iname "*$CURRENTLY_PACKAGING*" \) | xargs rm -v
 }
 
 package_sensible-pager() {
-  CURRENTLY_PACKAGING=sensible-pager _package_sensible
+  CURRENTLY_PACKAGING=sensible-pager pkgdir="$pkgdir" _package_sensible
 }
 
 package_sensible-browser() {
-  CURRENTLY_PACKAGING=sensible-browser _package_sensible
+  CURRENTLY_PACKAGING=sensible-browser pkgdir="$pkgdir" _package_sensible
 }
 
 package_sensible-editor() {
-  CURRENTLY_PACKAGING=editor _package_sensible
+  CURRENTLY_PACKAGING=editor pkgdir="$pkgdir" _package_sensible
 }
 
-package_sensible-utils() {
-  CURRENTLY_PACKAGING=sensible-utils _package_sensible
+package_sensible-utils-data() {
+  CURRENTLY_PACKAGING=gettext pkgdir="$pkgdir" _package_sensible
 }
 
-package_sensible-utils-data() {
-  CURRENTLY_PACKAGING=gettext _package_sensible
+package_sensible-utils() {
+  pkgdesc="$pkgdesc (metapackage)"
+  provides=()
+  conflicts=()
+  depends+=(sensible-pager sensible-editor sensible-browser sensible-utils-data)
+  mkdir -p "$pkgdir/usr/share/sensible-utils"
+  echo 1 > "$pkgdir/usr/share/sensible-utils/.ARCH"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/sensible-utils_0.0.19.dsc.sig b/sensible-utils_0.0.19.dsc.sig
new file mode 100644
index 000000000000..ee58d0735ddd
--- /dev/null
+++ b/sensible-utils_0.0.19.dsc.sig
diff --git a/sensible-utils_0.0.19.tar.xz.sig b/sensible-utils_0.0.19.tar.xz.sig
new file mode 100644
index 000000000000..396ee85b5f61
--- /dev/null
+++ b/sensible-utils_0.0.19.tar.xz.sig