forked from pool/devscripts
664d8c3169
- update to 2.22.2: * who-permits-upload: + Fix fingerprint lookup, so it actually finds the user id * debsnap: + Add a -l option as the short version of --list. Closes: #1006904 * sadt: + Run autodep8 when looking for autopkgtests to run. * deprepro: + Add new options, to make it easier to debrepro against arbitrary source directories (i.e. not Debian packages): - -B, --build-command: specify custom build command - -a, --artifact-pattern: specify custom artifacts to be compared across builds - --no-copy: run commands against the source tree directly, i.e. don't copy it to a temporary build directory. * mk-origtargz: + Apply patch from Vasyl Gello to make Files-Included-<component> work. * Include the updated Portuguese translation. Closes: #1011316 Thanks to Américo Monteiro <a_monteiro@gmx.com>. * Run perltidy with the newer 20220217. * Bump Standards-Version to 4.6.1, no changes needed. * mk-origtargz: + Display compression/tar errors * wrap-and-sort: + Introduce an experimental mode using the RTS parser available with python-debian >= 0.1.43. This will let wrap-and-sort retain comments. This feature is opt-in with a new flag. MR: !237 + Futher improvements to the RTS mode, now also supporting short indent (-s) among others. MR: !263 * deb-janitor: OBS-URL: https://build.opensuse.org/request/show/988729 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/devscripts?expand=0&rev=27
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
Index: devscripts-v2.22.2/Makefile
|
|
===================================================================
|
|
--- devscripts-v2.22.2.orig/Makefile
|
|
+++ devscripts-v2.22.2/Makefile
|
|
@@ -4,7 +4,7 @@ include Makefile.common
|
|
|
|
DESTDIR =
|
|
|
|
-all: version doc make_scripts conf.default translated_manpages
|
|
+all: version doc conf.default
|
|
|
|
version:
|
|
rm -f version
|
|
Index: devscripts-v2.22.2/Makefile.common
|
|
===================================================================
|
|
--- devscripts-v2.22.2.orig/Makefile.common
|
|
+++ devscripts-v2.22.2/Makefile.common
|
|
@@ -14,3 +14,5 @@ PERLMOD_DIR = $(shell perl -MConfig -e '
|
|
DATA_DIR = $(PREFIX)/share/devscripts
|
|
TEMPLATES_DIR = $(DATA_DIR)/templates
|
|
SYSCONFDIR = /etc
|
|
+
|
|
+XSL_STYLESHEET = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
|
|
Index: devscripts-v2.22.2/po4a/Makefile
|
|
===================================================================
|
|
--- devscripts-v2.22.2.orig/po4a/Makefile
|
|
+++ devscripts-v2.22.2/po4a/Makefile
|
|
@@ -33,8 +33,7 @@ clean: ../doc/devscripts.1
|
|
-podchecker $<
|
|
pod2man --utf8 --center=" " --release="$(DESC_$(dir $@))" $< > $@
|
|
%.1:: %.dbk translate
|
|
- xsltproc --nonet \
|
|
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
|
|
+ xsltproc --nonet -o $@ $(XSL_STYLESHEET) $<
|
|
# /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.
|
|
Index: devscripts-v2.22.2/scripts/Makefile
|
|
===================================================================
|
|
--- devscripts-v2.22.2.orig/scripts/Makefile
|
|
+++ devscripts-v2.22.2/scripts/Makefile
|
|
@@ -87,8 +87,7 @@ endif
|
|
podchecker $<
|
|
pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
|
|
%.1: %.dbk
|
|
- xsltproc --nonet -o $@ \
|
|
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
|
|
+ xsltproc --nonet -o $@ $(XSL_STYLESHEET) $<
|
|
|
|
# Syntax checker
|
|
test_sh: $(SH_CHECKS)
|