13.11.7

2 files changed, 43 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73db8bc4a7db..ea48ce06deed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = debhelper
 	pkgdesc = A collection of programs that can be used in a debian/rules file to automate common tasks
-	pkgver = 13.11.5
+	pkgver = 13.11.7
 	pkgrel = 1
-	url = https://salsa.debian.org/debian/debhelper.git/
+	url = https://salsa.debian.org/debian/debhelper
 	arch = any
 	license = GPL2
 	license = GPL3
@@ -20,9 +20,9 @@ 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.11.5
+	source = git+https://salsa.debian.org/debian/debhelper.git#tag=debian/13.11.7
 	source = dh_strip_nondeterminism::https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/raw/master/bin/dh_strip_nondeterminism?inline=false
-	md5sums = SKIP
-	md5sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = debhelper
diff --git a/PKGBUILD b/PKGBUILD
index 24237d19b451..710ddc51eb23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,17 @@
 # Contributor: Charles Pigott <charlespigott@googlemail.com>
 # Contributor: Andrei "Garoth" Thorp <garoth "at the nice" gmail "dot" com>
 
-_pkgname=debhelper
+_pkgname="debhelper"
 pkgname="$_pkgname"
-pkgver=13.11.5
+pkgver=13.11.7
 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=('GPL2' 'GPL3')
 arch=('any')
-url="https://salsa.debian.org/debian/debhelper.git/"
+
 _url_dh_strip_nondeterminism="https://salsa.debian.org/reproducible-builds/strip-nondeterminism"
-license=('GPL2' 'GPL3')
+
 depends=(
   'binutils'
   'dpkg'
@@ -34,28 +36,45 @@ optdepends=(
   'dh-make: convert source archives into Debian package source'
 )
 
-provides=('dh-strip-nondeterminism')
-conflicts=('dh-strip-nondeterminism')
+if [ x"$pkgname" == x"$_pkgname" ] ; then
+  # normal package
+  _pkgsrc="$_pkgname"
+  source=("git+$url.git#tag=debian/${pkgver%%.r*}")
+  sha256sums=('SKIP')
 
-source=(
-  "git+https://salsa.debian.org/debian//debhelper.git#tag=debian/$pkgver"
-  dh_strip_nondeterminism::"${_url_dh_strip_nondeterminism}/-/raw/master/bin/dh_strip_nondeterminism?inline=false"
-  )
-md5sums=(
-  'SKIP'
-  'SKIP'
-)
+  pkgver() {
+    echo "${pkgver%%.r*}"
+  }
+else
+  # git package
+  provides=("$_pkgname")
+  conflicts=("$_pkgname")
+
+  _pkgsrc="$_pkgname"
+  source=("$_pkgsrc"::"git+$url.git")
+  sha256sums=('SKIP')
+
+  pkgver() {
+    cd "$_pkgsrc"
+    git describe --long --tags | 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?inline=false")
+sha256sums+=('SKIP')
 
 build() {
-  cd "$srcdir/$pkgname"
+  cd "$_pkgsrc"
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname"
-  make DESTDIR="$pkgdir/" install
-
-  install -Dm755 "${srcdir}/dh_strip_nondeterminism" -t "${pkgdir}/usr/bin"
+  cd "$_pkgsrc"
+  make DESTDIR="${pkgdir:?}" install
+  install -Dm755 "${srcdir:?}/dh_strip_nondeterminism" -t "${pkgdir:?}/usr/bin"
 }
 
 # vim:set ts=2 sw=2 et: