From 90aa2071d156d517911ae78538db04c37dfe658a Mon Sep 17 00:00:00 2001
From: Giovanni Santini <giovannisantini93@yahoo.it>
Date: Fri, 28 Mar 2025 15:05:42 +0100
Subject: [PATCH] upgpkg: devscripts 2.25.6-1

- Version bump.
- Patch update.
---
 .SRCINFO    |  8 ++++----
 PKGBUILD    |  6 +++---
 fixes.patch | 29 +++++++++++++----------------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index f903ab1..ecddc74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = devscripts
 	pkgdesc = Scripts to make the life of a Debian Package maintainer easier
-	pkgver = 2.25.5
+	pkgver = 2.25.6
 	pkgrel = 1
 	url = https://tracker.debian.org/pkg/devscripts
 	arch = i686
@@ -40,9 +40,9 @@ pkgbase = devscripts
 	provides = checkbashisms
 	conflicts = checkbashisms
 	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
-	sha256sums = ef533a030de51558ff19e80a17387074e61d9a48c70ba0e7b649571adf6d6ea7
-	sha256sums = f8e7ce50c0d008c5d38c94b93c9fc560e5dd2cc8f06eeb2909b0b1784911b768
+	sha256sums = 309022afff6f9b5096ac81e69b587390e06ee00489e60259070b7e7bdb2723a4
+	sha256sums = 7aef55eaf111cf2ec99f68d9a69357bd8b5f400d3260ccf99c981ab37de93b07
 
 pkgname = devscripts
diff --git a/PKGBUILD b/PKGBUILD
index da18732..ed92705 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: JD Horelick <jdhore1@gmail.com>
 
 pkgname=devscripts
-pkgver=2.25.5
+pkgver=2.25.6
 pkgrel=1
 pkgdesc="Scripts to make the life of a Debian Package maintainer easier"
 arch=('i686' 'x86_64')
@@ -46,8 +46,8 @@ source=(
     "https://deb.debian.org/debian/pool/main/${pkgname:0:1}/${pkgname}/${pkgname}_${pkgver}.tar.xz"
     fixes.patch
 )
-sha256sums=('ef533a030de51558ff19e80a17387074e61d9a48c70ba0e7b649571adf6d6ea7'
-            'f8e7ce50c0d008c5d38c94b93c9fc560e5dd2cc8f06eeb2909b0b1784911b768')
+sha256sums=('309022afff6f9b5096ac81e69b587390e06ee00489e60259070b7e7bdb2723a4'
+            '7aef55eaf111cf2ec99f68d9a69357bd8b5f400d3260ccf99c981ab37de93b07')
 
 prepare(){
     # Sometimes there is the version in the tarball, sometimes not.
diff --git a/fixes.patch b/fixes.patch
index b31508f..7d91100 100644
--- a/fixes.patch
+++ b/fixes.patch
@@ -1,28 +1,25 @@
-diff -urN devscripts-2.21.2/po4a/Makefile devscripts-2.21.2_patched/po4a/Makefile
---- devscripts-2.21.2/po4a/Makefile	2021-03-16 14:16:39.000000000 +0100
-+++ devscripts-2.21.2_patched/po4a/Makefile	2021-06-10 12:31:21.021880200 +0200
-@@ -34,7 +34,7 @@
- 	pod2man --utf8 --center=" " --release="$(DESC_$(dir $@))" $< > $@
+diff -urN a/po4a/Makefile b/po4a/Makefile
+--- a/po4a/Makefile	2025-03-27 22:14:20.000000000 +0100
++++ b/po4a/Makefile	2025-03-28 15:03:25.754220434 +0100
+@@ -35,4 +35,4 @@
  %.1:: %.dbk translate
- 	xsltproc --nonet \
+ 	mkdir -p $(LANGS)
+ 	xsltproc --nonet -o $@ \
 -	  /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/sgml/docbook/stylesheet/xsl/nwalsh/manpages/other.xsl
- 	# (which is imported by the above stylesheet) insists in writing the output
- 	# to where it wants to.  we can only move the file ourselves.
-diff -urN devscripts-2.21.2/scripts/Makefile devscripts-2.21.2_patched/scripts/Makefile
---- 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 @@
++	  /usr/share/xml/docbook/xsl-stylesheets/manpages/docbook.xsl $<
+diff -urN a/scripts/Makefile b/scripts/Makefile
+--- a/scripts/Makefile	2024-12-12 16:54:36.000000000 +0100
++++ b/scripts/Makefile	2025-03-28 15:02:45.444814214 +0100
+@@ -91,7 +91,7 @@
  	pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
  %.1: %.dbk
  	xsltproc --nonet -o $@ \
 -	  /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
  test_sh: $(SH_CHECKS)
-@@ -142,7 +142,7 @@
+@@ -166,7 +166,7 @@
  test: test_pl test_sh test_py
  
  install: all