summarylogtreecommitdiffstats
path: root/fixes.patch
blob: b31508fb9012bf20aa22fa0958ecc228cf504bda (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
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 $@))" $< > $@
 %.1:: %.dbk translate
 	xsltproc --nonet \
-	  /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 @@
 	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 $<
 
 # Syntax checker
 test_sh: $(SH_CHECKS)
@@ -142,7 +142,7 @@
 test: test_pl test_sh test_py
 
 install: all
-	python3 setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
+	python3 setup.py install --root="$(DESTDIR)" --no-compile
 	cp $(SCRIPTS) $(DESTDIR)$(BINDIR)
 	ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch
 	install -d $(DESTDIR)$(COMPL_DIR)