From d1beeee06b173db3cfed3a87af721471535dbbd0 Mon Sep 17 00:00:00 2001 From: xiota Date: Mon, 25 Aug 2025 15:59:22 +0000 Subject: [PATCH] 13.26 --- .SRCINFO | 7 +++---- PKGBUILD | 30 +++++++++++------------------- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0c52fb3220736..16a0059bc4504 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = debhelper pkgdesc = Programs to automate common tasks in debian/rules when building Debian packages - pkgver = 13.25 + pkgver = 13.26 pkgrel = 1 url = https://salsa.debian.org/debian/debhelper arch = any @@ -10,10 +10,9 @@ pkgbase = debhelper depends = dpkg depends = perl-pod-parser optdepends = dh-make: convert source archives into Debian package source - conflicts = dh-strip-nondeterminism - source = debhelper::git+https://salsa.debian.org/debian/debhelper.git#tag=debian/13.25 + source = debhelper::git+https://salsa.debian.org/debian/debhelper.git#tag=debian/13.26 source = strip-nondeterminism::git+https://salsa.debian.org/reproducible-builds/strip-nondeterminism.git - sha256sums = aea3db39b218623da2e7cf995ed5cb06f8cc28ddcd31fd2818e60d3b11203d0a + sha256sums = 5ee8275f007862574bff5655902b8faf1bf834a7ffadb1bb19a508500229c737 sha256sums = SKIP pkgname = debhelper diff --git a/PKGBUILD b/PKGBUILD index 5d3d5bbbb9cda..0ee9d63849913 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,11 +3,9 @@ # Contributor: Antoine Lubineau # Contributor: Charles Pigott -: ${_cksum:=aea3db39b218623da2e7cf995ed5cb06f8cc28ddcd31fd2818e60d3b11203d0a} - _pkgname="debhelper" pkgname="$_pkgname" -pkgver=13.25 +pkgver=13.26 pkgrel=1 pkgdesc="Programs to automate common tasks in debian/rules when building Debian packages" url="https://salsa.debian.org/debian/debhelper" @@ -26,22 +24,16 @@ optdepends=( 'dh-make: convert source archives into Debian package source' ) -_source_main() { - _pkgsrc="$_pkgname" - source=("$_pkgsrc"::"git+$url.git#tag=debian/$pkgver") - sha256sums=("${_cksum:?}") -} - -_source_dh_strip_nd() { - conflicts+=("dh-strip-nondeterminism") - - _pkgsrc_dh_strip_nd="strip-nondeterminism" - source+=("$_pkgsrc_dh_strip_nd"::"git+https://salsa.debian.org/reproducible-builds/strip-nondeterminism.git") - sha256sums+=('SKIP') -} - -_source_main -_source_dh_strip_nd +_pkgsrc="$_pkgname" +_pkgsrc_dh_strip_nd="strip-nondeterminism" +source=( + "$_pkgsrc"::"git+$url.git#tag=debian/$pkgver" + "$_pkgsrc_dh_strip_nd"::"git+https://salsa.debian.org/reproducible-builds/strip-nondeterminism.git" +) +sha256sums=( + '5ee8275f007862574bff5655902b8faf1bf834a7ffadb1bb19a508500229c737' + 'SKIP' +) build() { cd "$_pkgsrc"