From fee0fbed32d1cc213be129b7149ae61b53225b4d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sep 14 2017 20:02:48 +0000 Subject: Update to 2.17.10 --- diff --git a/.gitignore b/.gitignore index affcc4f..750c44a 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /devscripts_2.17.7.tar.xz /devscripts_2.17.8.tar.xz /devscripts_2.17.9.tar.xz +/devscripts_2.17.10.tar.xz diff --git a/devscripts.spec b/devscripts.spec index ab8cd63..705b604 100644 --- a/devscripts.spec +++ b/devscripts.spec @@ -1,6 +1,6 @@ Name: devscripts -Version: 2.17.9 -Release: 2%{?dist} +Version: 2.17.10 +Release: 1%{?dist} Summary: Scripts for Debian Package maintainers License: GPLv2+ @@ -74,6 +74,7 @@ BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: /usr/bin/dpkg-buildflags BuildRequires: /usr/bin/dpkg-vendor BuildRequires: /usr/bin/dpkg-parsechangelog +BuildRequires: /usr/bin/help2man BuildRequires: pkgconfig(bash-completion) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -165,6 +166,9 @@ rm -f %{buildroot}%{_datadir}/bash-completion/completions/bts # Empty %changelog +* Thu Sep 14 2017 Sandro Mani - 2.17.10-1 +- Update to 2.17.10 + * Wed Aug 02 2017 Fedora Release Engineering - 2.17.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/devscripts_docbook.patch b/devscripts_docbook.patch index 1583ed0..2d95af4 100644 --- a/devscripts_docbook.patch +++ b/devscripts_docbook.patch @@ -1,6 +1,6 @@ -diff -rupN devscripts-2.15.4/po4a/Makefile devscripts-2.15.4-new/po4a/Makefile ---- devscripts-2.15.4/po4a/Makefile 2015-04-26 04:01:25.000000000 +0200 -+++ devscripts-2.15.4-new/po4a/Makefile 2015-04-28 09:35:59.751559003 +0200 +diff -rupN devscripts-2.17.10/po4a/Makefile devscripts-2.17.10-new/po4a/Makefile +--- devscripts-2.17.10/po4a/Makefile 2017-09-14 04:08:30.000000000 +0200 ++++ devscripts-2.17.10-new/po4a/Makefile 2017-09-14 21:51:28.608136788 +0200 @@ -28,7 +28,7 @@ de/%.de.1: de/%.de.pod translate pod2man --utf8 --center=" " --release="Debian-Hilfswerkzeuge" $< > $@ de/%.de.1: de/%.de.dbk translate @@ -19,15 +19,15 @@ diff -rupN devscripts-2.15.4/po4a/Makefile devscripts-2.15.4-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.15.4/scripts/Makefile devscripts-2.15.4-new/scripts/Makefile ---- devscripts-2.15.4/scripts/Makefile 2015-04-26 04:01:25.000000000 +0200 -+++ devscripts-2.15.4-new/scripts/Makefile 2015-04-28 09:35:59.751559003 +0200 -@@ -60,7 +60,7 @@ endif +diff -rupN devscripts-2.17.10/scripts/Makefile devscripts-2.17.10-new/scripts/Makefile +--- devscripts-2.17.10/scripts/Makefile 2017-09-14 04:08:30.000000000 +0200 ++++ devscripts-2.17.10-new/scripts/Makefile 2017-09-14 21:51:28.609136785 +0200 +@@ -63,7 +63,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 2757fd3..4e5a17e 100644 --- a/devscripts_install-layout.patch +++ b/devscripts_install-layout.patch @@ -1,8 +1,8 @@ -diff -Naur devscripts-2.15.5.orig/scripts/Makefile devscripts-2.15.5/scripts/Makefile ---- devscripts-2.15.5.orig/scripts/Makefile 2015-06-11 05:14:09.000000000 +0200 -+++ devscripts-2.15.5/scripts/Makefile 2015-06-17 13:10:48.963299776 +0200 -@@ -86,7 +86,7 @@ - $(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n)) +diff -rupN devscripts-2.17.10/scripts/Makefile devscripts-2.17.10-new/scripts/Makefile +--- devscripts-2.17.10/scripts/Makefile 2017-09-14 21:52:06.784038830 +0200 ++++ devscripts-2.17.10-new/scripts/Makefile 2017-09-14 21:52:16.007015284 +0200 +@@ -111,7 +111,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 4354aa9..4bc8a37 100644 --- a/devscripts_install-man.patch +++ b/devscripts_install-man.patch @@ -1,11 +1,11 @@ -diff -Naur devscripts-2.15.5.orig/scripts/Makefile devscripts-2.15.5/scripts/Makefile ---- devscripts-2.15.5.orig/scripts/Makefile 2015-06-11 05:14:09.000000000 +0200 -+++ devscripts-2.15.5/scripts/Makefile 2015-06-17 13:23:52.334485605 +0200 -@@ -95,5 +95,7 @@ +diff -rupN devscripts-2.17.10/scripts/Makefile devscripts-2.17.10-new/scripts/Makefile +--- devscripts-2.17.10/scripts/Makefile 2017-09-14 21:52:34.823967385 +0200 ++++ devscripts-2.17.10-new/scripts/Makefile 2017-09-14 21:52:42.823947077 +0200 +@@ -125,5 +125,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 diff --git a/devscripts_unknown_experimental.patch b/devscripts_unknown_experimental.patch index 1da3253..c05fbca 100644 --- a/devscripts_unknown_experimental.patch +++ b/devscripts_unknown_experimental.patch @@ -1,5 +1,6 @@ ---- ./scripts/git-deborig.pl.orig 2017-02-13 05:18:09.031374190 +0000 -+++ ./scripts/git-deborig.pl 2017-02-13 05:18:26.316548488 +0000 +diff -rupN devscripts-2.17.10/scripts/git-deborig.pl devscripts-2.17.10-new/scripts/git-deborig.pl +--- devscripts-2.17.10/scripts/git-deborig.pl 2017-09-14 04:08:30.000000000 +0200 ++++ devscripts-2.17.10-new/scripts/git-deborig.pl 2017-09-14 21:53:11.726873968 +0200 @@ -61,7 +61,7 @@ B was written by Sean Whitt use strict; diff --git a/sources b/sources index 0699e13..59c7544 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (devscripts_2.17.9.tar.xz) = 00bc2fea2aa2f5806f6ecedee96c09c0ff31d99283e7b242f85c04a63310ada692df2bbef0cfde73dbcf3ac455026a5262b298fb2348528f2a9d7ce7916d97dd +SHA512 (devscripts_2.17.10.tar.xz) = eb2bcd29237696e0e768d2513fa895891cb2b368c41c6d611ad7db815400b22317324b8326d4e71b1ab511a8a7abafdf0a2f2641da955034ae58b3d4aad3fc77