summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD42
2 files changed, 11 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 99b2936ff0dc..41d3339187ca 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.15.2
+ pkgver = 13.15.3
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.15.2
- source = dh_strip_nondeterminism-dh_13.15.2::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.15.3
+ source = dh_strip_nondeterminism-dh_13.15.3::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 b6bcaed7634f..0feb0d628e75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,23 +7,15 @@
# https://salsa.debian.org/debian/debhelper
# https://salsa.debian.org/reproducible-builds/strip-nondeterminism
-## options
-: ${_build_git:=false}
-
-unset _pkgtype
-[[ "${_build_git::1}" == "t" ]] && _pkgtype+="-git"
-
-## basic info
_pkgname="debhelper"
-pkgname="$_pkgname${_pkgtype:-}"
-pkgver=13.15.2
+pkgname="$_pkgname"
+pkgver=13.15.3
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')
-# main package
depends=(
'dpkg'
'perl-pod-parser'
@@ -36,29 +28,13 @@ optdepends=(
'dh-make: convert source archives into Debian package source'
)
-if [ "${_build_git::1}" != "t" ] ; then
- # stable package
- _pkgsrc="$_pkgname"
- source=("git+$url.git#tag=debian/${pkgver%%.r*}")
- sha256sums=('SKIP')
-
- pkgver() {
- echo "${pkgver%%.r*}"
- }
-else
- # git package
- provides=("$_pkgname=${pkgver%%.r*}")
- conflicts=("$_pkgname")
+_pkgsrc="$_pkgname"
+source=("git+$url.git#tag=debian/${pkgver%%.r*}")
+sha256sums=('SKIP')
- _pkgsrc="$_pkgname"
- source=("$_pkgsrc"::"git+$url.git")
- sha256sums=('SKIP')
-
- pkgver() {
- cd "$_pkgsrc"
- git describe --long --tags --abbrev=8 | sed 's/^debian\///;s/\([^-]*-g\)/r\1/;s/-/./g'
- }
-fi
+pkgver() {
+ echo "${pkgver%%.r*}"
+}
provides+=("dh-strip-nondeterminism")
conflicts+=("dh-strip-nondeterminism")
@@ -97,5 +73,3 @@ package() {
make DESTDIR="$pkgdir" install
install -Dm755 "$srcdir/$_dh_strip_nondeterminism_script" "$pkgdir/usr/bin/dh_strip_nondeterminism"
}
-
-# vim:set ts=2 sw=2 et: