diff --git a/.SRCINFO b/.SRCINFO index 669e7b6..524830c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = sensible-utils pkgdesc = Utilities for sensible alternative selection pkgver = 0.0.20 - pkgrel = 1 + pkgrel = 2 url = http://packages.debian.org/source/sid/sensible-utils arch = any license = GPL @@ -10,16 +10,6 @@ pkgbase = sensible-utils makedepends = po4a depends = bash depends = coreutils - provides = sensible-browser - provides = sensible-editor - provides = sensible-pager - provides = sensible-terminal - provides = sensible-utils - conflicts = sensible-browser - conflicts = sensible-editor - conflicts = sensible-pager - conflicts = sensible-terminal - conflicts = sensible-utils 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 = sensible-utils_0.0.20_.dsc.asc @@ -44,9 +34,6 @@ pkgname = sensible-utils depends = sensible-editor depends = sensible-pager depends = sensible-terminal - depends = sensible-utils depends = sensible-utils-data - provides = - conflicts = pkgname = sensible-utils-data diff --git a/PKGBUILD b/PKGBUILD index 1554301..dfb7f2a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,19 +3,17 @@ # Contributor: Brian BIdulock pkgbase=sensible-utils -_pkgname='sensible-browser sensible-editor sensible-pager sensible-terminal sensible-utils' +_pkgname='sensible-browser sensible-editor sensible-pager sensible-terminal' declare -g -a pkgname=($_pkgname) -pkgname+=(sensible-utils-data) +pkgname+=(sensible-utils sensible-utils-data) pkgver=0.0.20 _debianextra='' -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for sensible alternative selection" arch=('any') url="http://packages.debian.org/source/sid/sensible-utils" license=('GPL') depends=('bash' 'coreutils') -provides=($_pkgname) -conflicts=($_pkgname) makedepends=('po4a') checkdepends=('ed' 'dash') _dirname=${pkgbase}_${pkgver}_$pkgrel_${_debianextra} @@ -52,11 +50,7 @@ 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 @@ -87,8 +81,6 @@ package_sensible-utils-data() { package_sensible-utils() { pkgdesc="$pkgdesc (metapackage)" - provides=() - conflicts=() depends+=($_pkgname sensible-utils-data) mkdir -p "$pkgdir/usr/share/sensible-utils" echo 1 > "$pkgdir/usr/share/sensible-utils/.ARCH"