summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Santini2023-02-20 14:41:27 +0100
committerGiovanni Santini2023-02-20 14:41:27 +0100
commit63f137d82f9b31dd710a0f677777ef3931c3d25f (patch)
tree0d5604e94b80d6e845857f3f9a15e41212d3a7ff
parent3f5966e0cd8ea27a0d8b40223f2b0298646d49c3 (diff)
downloadaur-63f137d82f9b31dd710a0f677777ef3931c3d25f.tar.gz
upgpkg: devscripts 2.23.1-3
- Fix PKGBUILD typos in conflicts and provides - Ensure working build in systems where the package is already installed
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD10
2 files changed, 10 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c57e73ad240d..164965a734c3 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 a7f2dcc77491..b021c9108df6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
# Maintainer: Giovanni 'ItachiSan' Santini <giovannisantini93@yahoo.it>
+# Contributor: Ferdinand Bachmann <theferdi265@gmail.com>
# Contributor: Jochen Schalanda <jochen+aur@schalanda.name>
# Contributor: Charles Pigott <charlespigott@googlemail.com>
# Contributor: André Klitzing <aklitzing@online.de>
@@ -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() {