Package/devscripts
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgpkg: devscripts 2.21.2-1

Browse Source 
- Updated the patch for newer devscripts:
  https://github.com/ItachiSan/linux_packaging/issues/8
- Added missing optdepts for `uscan`:
  https://github.com/ItachiSan/linux_packaging/issues/9
This commit is contained in:
Giovanni Santini
2021-06-10 23:26:14 +02:00
parent 0ccbc6e72b
commit d86c229e41
3 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
fixes.patch
View File

@@ -1,40 +1,29 @@
diff --git a/po4a/Makefile b/po4a/Makefile
index f19b24df..6a43f037 100644
--- a/po4a/Makefile
+++ b/po4a/Makefile
@@ -28,7 +28,7 @@ de/%.de.1: de/%.de.pod translate
pod2man --utf8 --center=" " --release="Debian-Hilfswerkzeuge" $< > $@
de/%.de.1: de/%.de.dbk translate
xsltproc --nonet -o $@ \
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-1.79.2/manpages/docbook.xsl $<
# xsltproc writes out to foo.1 even if you tell it to do otherwise, so we have
# to rename the file after it's generated
mv de/$*.1 $@
@@ -41,7 +41,7 @@ fr/%.fr.1: fr/%.fr.pod translate
pod2man --utf8 --center=" " --release="Utilitaires Debian" $< > $@
fr/%.fr.1: fr/%.fr.dbk translate
xsltproc --nonet -o $@ \
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
+ /usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/docbook.xsl $<
# xsltproc writes out to foo.1 even if you tell it to do otherwise, so we have
# to rename the file after it's generated
mv fr/$*.1 $@
diff --git a/scripts/Makefile b/scripts/Makefile
index ece5455a..78bdb942 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -64,7 +64,7 @@ endif
+ /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-1.79.2/manpages/docbook.xsl $<
+ /usr/share/xml/docbook/xsl-stylesheets-$(shell pacman -Q docbook-xsl | sed -E 's|.* ([0-9.]+)-.*|\1|')/manpages/docbook.xsl $<
# There is a slight chance this gets called twice, once here from here and once
# from ../po4a/Makefile. Treat files with care.
@@ -93,7 +93,7 @@ test:
$(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n))
# 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