From 01aa3128a8bef61a12d8edcd3cc90dfa4d5c1104 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 4 Mar 2021 22:38:59 +0100 Subject: [PATCH] - rediff patches - rel 3 --- devscripts.spec | 2 +- devscripts_docbook.patch | 23 +++++++++++------------ devscripts_install-layout.patch | 11 +++++------ devscripts_install-man.patch | 15 +++++++-------- 4 files changed, 24 insertions(+), 27 deletions(-) diff --git a/devscripts.spec b/devscripts.spec index 5fe2bf8..df2431e 100644 --- a/devscripts.spec +++ b/devscripts.spec @@ -4,7 +4,7 @@ Summary: Scripts for Debian Package maintainers Name: devscripts Version: 2.18.6 -Release: 2 +Release: 3 License: GPL v2+ Group: Development Source0: http://ftp.debian.org/debian/pool/main/d/devscripts/%{name}_%{version}.tar.xz diff --git a/devscripts_docbook.patch b/devscripts_docbook.patch index 2584c6b..54d0b3b 100644 --- a/devscripts_docbook.patch +++ b/devscripts_docbook.patch @@ -1,8 +1,7 @@ -# Fixes path to xsl-stylesheet manpages docbook.xsl -diff -rupN devscripts-2.13.3/po4a/Makefile devscripts-2.13.3-new/po4a/Makefile ---- devscripts-2.13.3/po4a/Makefile 2013-08-16 02:01:22.000000000 +0200 -+++ devscripts-2.13.3-new/po4a/Makefile 2013-09-19 18:03:22.092429895 +0200 -@@ -25,7 +25,7 @@ de/%.de.1: de/%.de.pl translate +diff -urNp -x '*.orig' devscripts-2.18.6.org/po4a/Makefile devscripts-2.18.6/po4a/Makefile +--- devscripts-2.18.6.org/po4a/Makefile 2017-10-01 17:57:17.000000000 +0200 ++++ devscripts-2.18.6/po4a/Makefile 2021-03-04 22:38:10.917081273 +0100 +@@ -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 $@ \ @@ -11,7 +10,7 @@ diff -rupN devscripts-2.13.3/po4a/Makefile devscripts-2.13.3-new/po4a/Makefile # 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 $@ -@@ -35,7 +35,7 @@ fr/%.fr.1: fr/%.fr.pl translate +@@ -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 $@ \ @@ -20,15 +19,15 @@ diff -rupN devscripts-2.13.3/po4a/Makefile devscripts-2.13.3-new/po4a/Makefile # 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 -rupN devscripts-2.13.3/scripts/Makefile devscripts-2.13.3-new/scripts/Makefile ---- devscripts-2.13.3/scripts/Makefile 2013-08-16 02:01:22.000000000 +0200 -+++ devscripts-2.13.3-new/scripts/Makefile 2013-09-19 18:03:22.264433043 +0200 -@@ -61,7 +61,7 @@ endif +diff -urNp -x '*.orig' devscripts-2.18.6.org/scripts/Makefile devscripts-2.18.6/scripts/Makefile +--- devscripts-2.18.6.org/scripts/Makefile 2018-09-06 21:20:10.000000000 +0200 ++++ devscripts-2.18.6/scripts/Makefile 2021-03-04 22:38:10.917081273 +0100 +@@ -86,7 +86,7 @@ endif pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@ %.1: %.dbk xsltproc --nonet -o $@ \ - /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< + /usr/share/sgml/docbook/xsl-stylesheets/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. + # Syntax checker + test_sh: $(SH_CHECKS) diff --git a/devscripts_install-layout.patch b/devscripts_install-layout.patch index 9711bc7..1f36c34 100644 --- a/devscripts_install-layout.patch +++ b/devscripts_install-layout.patch @@ -1,9 +1,8 @@ -Removes the debian-only --install-layout python-setuptools option - ---- devscripts-2.15.7/scripts/Makefile~ 2015-08-03 09:38:41.000000000 +0300 -+++ devscripts-2.15.7/scripts/Makefile 2015-08-03 09:39:15.202484554 +0300 -@@ -86,7 +86,7 @@ - $(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n)) +diff -urNp -x '*.orig' devscripts-2.18.6.org/scripts/Makefile devscripts-2.18.6/scripts/Makefile +--- devscripts-2.18.6.org/scripts/Makefile 2021-03-04 22:38:11.020414057 +0100 ++++ devscripts-2.18.6/scripts/Makefile 2021-03-04 22:38:11.090413685 +0100 +@@ -133,7 +133,7 @@ clean: + test: test_pl test_sh test_py install: all - python3 setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb diff --git a/devscripts_install-man.patch b/devscripts_install-man.patch index 90c6f2e..c85a40d 100644 --- a/devscripts_install-man.patch +++ b/devscripts_install-man.patch @@ -1,12 +1,11 @@ -Install some additional man pages - ---- devscripts-2.13.4/scripts/Makefile 2013-09-20 00:55:41.000000000 +0200 -+++ devscripts-2.13.4-new/scripts/Makefile 2013-10-17 17:21:02.612017885 +0200 -@@ -103,5 +104,7 @@ install: all - install -dD $(DESTDIR)$(PERLMOD_DIR) - mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(PERLMOD_DIR) +diff -urNp -x '*.orig' devscripts-2.18.6.org/scripts/Makefile devscripts-2.18.6/scripts/Makefile +--- devscripts-2.18.6.org/scripts/Makefile 2021-03-04 22:38:11.193746470 +0100 ++++ devscripts-2.18.6/scripts/Makefile 2021-03-04 22:38:11.267079414 +0100 +@@ -147,5 +147,7 @@ install: all + install -d $(DESTDIR)$(DATA_DIR) + mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(DATA_DIR) cp debpkg-wrapper $(DESTDIR)$(BINDIR)/debpkg + install -dD $(DESTDIR)$(MAN1DIR) + cp *.1 $(DESTDIR)$(MAN1DIR) - .PHONY: test + .PHONY: test test_pl test_sh test_py all install clean scripts -- 2.44.0