diff --git a/.SRCINFO b/.SRCINFO index c57e73a..164965a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = devscripts pkgdesc = Scripts to make the life of a Debian Package maintainer easier pkgver = 2.23.1 - pkgrel = 2 + pkgrel = 3 url = https://tracker.debian.org/pkg/devscripts arch = i686 arch = x86_64 @@ -35,7 +35,8 @@ pkgbase = devscripts optdepends = perl-moo: Required for uscan optdepends = perl-ipc-run: Required for uscan optdepends = perl-lwp-protocol-https: Required for uscan - provides = checkbashism + provides = checkbashisms + conflicts = checkbashisms options = !makeflags source = https://deb.debian.org/debian/pool/main/d/devscripts/devscripts_2.23.1.tar.xz source = fixes.patch diff --git a/PKGBUILD b/PKGBUILD index a7f2dcc..b021c91 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: Giovanni 'ItachiSan' Santini +# Contributor: Ferdinand Bachmann # Contributor: Jochen Schalanda # Contributor: Charles Pigott # Contributor: André Klitzing @@ -6,7 +7,7 @@ pkgname=devscripts pkgver=2.23.1 -pkgrel=2 +pkgrel=3 pkgdesc="Scripts to make the life of a Debian Package maintainer easier" arch=('i686' 'x86_64') url="https://tracker.debian.org/pkg/devscripts" @@ -37,8 +38,8 @@ optdepends=( 'perl-ipc-run: Required for uscan' 'perl-lwp-protocol-https: Required for uscan' ) -provides=(checkbashism) -conflicst=(checkbashism) +provides=(checkbashisms) +conflicts=(checkbashisms) options=('!makeflags') source=( "https://deb.debian.org/debian/pool/main/${pkgname:0:1}/${pkgname}/${pkgname}_${pkgver}.tar.xz" @@ -50,6 +51,9 @@ sha256sums=('54eb392b18818460e56c052e40602bc9a1ba33c5349a58017c57b1d312b3ed9a' prepare(){ cd "$pkgname" patch -p1 -i "$srcdir/fixes.patch" + + # Ensure the local folder is recognized as a package and used appropriately. + touch "$srcdir/devscripts/scripts/devscripts/__init__.py" } build() {