upgpkg: devscripts 2.25.6-1

- Version bump.
- Patch update.
This commit is contained in:
Giovanni Santini
2025-03-28 15:05:42 +01:00
parent deb4c249ab
commit 90aa2071d1
3 changed files with 20 additions and 23 deletions

View File

@@ -1,6 +1,6 @@
pkgbase = devscripts pkgbase = devscripts
pkgdesc = Scripts to make the life of a Debian Package maintainer easier pkgdesc = Scripts to make the life of a Debian Package maintainer easier
pkgver = 2.25.5 pkgver = 2.25.6
pkgrel = 1 pkgrel = 1
url = https://tracker.debian.org/pkg/devscripts url = https://tracker.debian.org/pkg/devscripts
arch = i686 arch = i686
@@ -40,9 +40,9 @@ pkgbase = devscripts
provides = checkbashisms provides = checkbashisms
conflicts = checkbashisms conflicts = checkbashisms
options = !makeflags options = !makeflags
source = https://deb.debian.org/debian/pool/main/d/devscripts/devscripts_2.25.5.tar.xz source = https://deb.debian.org/debian/pool/main/d/devscripts/devscripts_2.25.6.tar.xz
source = fixes.patch source = fixes.patch
sha256sums = ef533a030de51558ff19e80a17387074e61d9a48c70ba0e7b649571adf6d6ea7 sha256sums = 309022afff6f9b5096ac81e69b587390e06ee00489e60259070b7e7bdb2723a4
sha256sums = f8e7ce50c0d008c5d38c94b93c9fc560e5dd2cc8f06eeb2909b0b1784911b768 sha256sums = 7aef55eaf111cf2ec99f68d9a69357bd8b5f400d3260ccf99c981ab37de93b07
pkgname = devscripts pkgname = devscripts

View File

@@ -6,7 +6,7 @@
# Contributor: JD Horelick <jdhore1@gmail.com> # Contributor: JD Horelick <jdhore1@gmail.com>
pkgname=devscripts pkgname=devscripts
pkgver=2.25.5 pkgver=2.25.6
pkgrel=1 pkgrel=1
pkgdesc="Scripts to make the life of a Debian Package maintainer easier" pkgdesc="Scripts to make the life of a Debian Package maintainer easier"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
@@ -46,8 +46,8 @@ source=(
"https://deb.debian.org/debian/pool/main/${pkgname:0:1}/${pkgname}/${pkgname}_${pkgver}.tar.xz" "https://deb.debian.org/debian/pool/main/${pkgname:0:1}/${pkgname}/${pkgname}_${pkgver}.tar.xz"
fixes.patch fixes.patch
) )
sha256sums=('ef533a030de51558ff19e80a17387074e61d9a48c70ba0e7b649571adf6d6ea7' sha256sums=('309022afff6f9b5096ac81e69b587390e06ee00489e60259070b7e7bdb2723a4'
'f8e7ce50c0d008c5d38c94b93c9fc560e5dd2cc8f06eeb2909b0b1784911b768') '7aef55eaf111cf2ec99f68d9a69357bd8b5f400d3260ccf99c981ab37de93b07')
prepare(){ prepare(){
# Sometimes there is the version in the tarball, sometimes not. # Sometimes there is the version in the tarball, sometimes not.

View File

@@ -1,28 +1,25 @@
diff -urN devscripts-2.21.2/po4a/Makefile devscripts-2.21.2_patched/po4a/Makefile diff -urN a/po4a/Makefile b/po4a/Makefile
--- devscripts-2.21.2/po4a/Makefile 2021-03-16 14:16:39.000000000 +0100 --- a/po4a/Makefile 2025-03-27 22:14:20.000000000 +0100
+++ devscripts-2.21.2_patched/po4a/Makefile 2021-06-10 12:31:21.021880200 +0200 +++ b/po4a/Makefile 2025-03-28 15:03:25.754220434 +0100
@@ -34,7 +34,7 @@ @@ -35,4 +35,4 @@
pod2man --utf8 --center=" " --release="$(DESC_$(dir $@))" $< > $@
%.1:: %.dbk translate %.1:: %.dbk translate
xsltproc --nonet \ mkdir -p $(LANGS)
xsltproc --nonet -o $@ \
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< - /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
+ /usr/share/xml/docbook/xsl-stylesheets-$(shell pacman -Q docbook-xsl | sed -E 's|.* ([0-9.]+)-.*|\1|')/manpages/docbook.xsl $< + /usr/share/xml/docbook/xsl-stylesheets/manpages/docbook.xsl $<
# /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/other.xsl diff -urN a/scripts/Makefile b/scripts/Makefile
# (which is imported by the above stylesheet) insists in writing the output --- a/scripts/Makefile 2024-12-12 16:54:36.000000000 +0100
# to where it wants to. we can only move the file ourselves. +++ b/scripts/Makefile 2025-03-28 15:02:45.444814214 +0100
diff -urN devscripts-2.21.2/scripts/Makefile devscripts-2.21.2_patched/scripts/Makefile @@ -91,7 +91,7 @@
--- devscripts-2.21.2/scripts/Makefile 2021-03-16 14:16:39.000000000 +0100
+++ devscripts-2.21.2_patched/scripts/Makefile 2021-06-10 12:35:12.481880200 +0200
@@ -87,7 +87,7 @@
pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@ pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
%.1: %.dbk %.1: %.dbk
xsltproc --nonet -o $@ \ xsltproc --nonet -o $@ \
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< - /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
+ /usr/share/xml/docbook/xsl-stylesheets-$(shell pacman -Q docbook-xsl | sed -E 's|.* ([0-9.]+)-.*|\1|')/manpages/docbook.xsl $< + /usr/share/xml/docbook/xsl-stylesheets/manpages/docbook.xsl $<
# Syntax checker # Syntax checker
test_sh: $(SH_CHECKS) test_sh: $(SH_CHECKS)
@@ -142,7 +142,7 @@ @@ -166,7 +166,7 @@
test: test_pl test_sh test_py test: test_pl test_sh test_py
install: all install: all