summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorxiota2024-02-26 06:05:19 +0000
committerxiota2024-02-26 06:06:41 +0000
commit10ced242ad2c01677c43d769c3b27e7990e17dcb (patch)
tree43a0f76191443f9f5152f403e4c16c0beea6ec06
parentc33afbc4a83d614045e6c55d080421a4225ff790 (diff)
downloadaur-10ced242ad2c01677c43d769c3b27e7990e17dcb.tar.gz
13.14.1
Prune contributor list. People who never had commit privileges may not appreciate having their contact info distributed
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD21
2 files changed, 16 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7e03aa00dfbb..0941bcd50db8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = debhelper
pkgdesc = A collection of programs that can be used in a debian/rules file to automate common tasks
- pkgver = 13.13
+ pkgver = 13.14.1
pkgrel = 1
url = https://salsa.debian.org/debian/debhelper
arch = any
@@ -12,8 +12,8 @@ pkgbase = debhelper
optdepends = dh-make: convert source archives into Debian package source
provides = dh-strip-nondeterminism
conflicts = dh-strip-nondeterminism
- source = git+https://salsa.debian.org/debian/debhelper.git#tag=debian/13.13
- source = dh_strip_nondeterminism::https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/raw/master/bin/dh_strip_nondeterminism
+ source = git+https://salsa.debian.org/debian/debhelper.git#tag=debian/13.14.1
+ source = dh_strip_nondeterminism-dh_13.14.1::https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/raw/master/bin/dh_strip_nondeterminism
sha256sums = SKIP
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 9c5fc8d5b366..67c35c0e19b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,10 @@
# Contributor: Justin Vreeland <vreeland.justin@gmail.com>
# Contributor: Antoine Lubineau <antoine@lubignon.info>
# Contributor: Charles Pigott <charlespigott@googlemail.com>
-# Contributor: Andrei "Garoth" Thorp <garoth "at the nice" gmail "dot" com>
+
+## useful links:
+# https://salsa.debian.org/debian/debhelper
+# https://salsa.debian.org/reproducible-builds/strip-nondeterminism
## options
: ${_build_git:=false}
@@ -13,15 +16,14 @@ unset _pkgtype
## basic info
_pkgname="debhelper"
pkgname="$_pkgname${_pkgtype:-}"
-pkgver=13.13
+pkgver=13.14.1
pkgrel=1
pkgdesc="A collection of programs that can be used in a debian/rules file to automate common tasks"
url="https://salsa.debian.org/debian/debhelper"
license=('GPL-2.0-or-later')
arch=('any')
-_url_dh_strip_nondeterminism="https://salsa.debian.org/reproducible-builds/strip-nondeterminism"
-
+# main package
depends=(
'dpkg'
'perl-pod-parser'
@@ -45,7 +47,7 @@ if [ "${_build_git::1}" != "t" ] ; then
}
else
# git package
- provides=("$_pkgname")
+ provides=("$_pkgname=${pkgver%%.r*}")
conflicts=("$_pkgname")
_pkgsrc="$_pkgname"
@@ -54,14 +56,17 @@ else
pkgver() {
cd "$_pkgsrc"
- git describe --long --tags | sed 's/^debian\///;s/\([^-]*-g\)/r\1/;s/-/./g'
+ git describe --long --tags --abbrev=8 | sed 's/^debian\///;s/\([^-]*-g\)/r\1/;s/-/./g'
}
fi
provides+=("dh-strip-nondeterminism")
conflicts+=("dh-strip-nondeterminism")
-source+=("dh_strip_nondeterminism"::"$_url_dh_strip_nondeterminism/-/raw/master/bin/dh_strip_nondeterminism")
+# dh_strip_nondeterminism
+_dh_strip_nondeterminism_url="https://salsa.debian.org/reproducible-builds/strip-nondeterminism"
+_dh_strip_nondeterminism_script="dh_strip_nondeterminism-dh_${pkgver%%.r*}"
+source+=("$_dh_strip_nondeterminism_script"::"$_dh_strip_nondeterminism_url/-/raw/master/bin/dh_strip_nondeterminism")
sha256sums+=('SKIP')
prepare() {
@@ -90,7 +95,7 @@ package() {
cd "$_pkgsrc"
make DESTDIR="$pkgdir" install
- install -Dm755 "$srcdir/dh_strip_nondeterminism" -t "$pkgdir/usr/bin"
+ install -Dm755 "$srcdir/$_dh_strip_nondeterminism_script" -t "$pkgdir/usr/bin/dh_strip_nondeterminism"
}
# vim:set ts=2 sw=2 et: