From a8bdf2405e548eeda2562d125c1b93938b59e56f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Apr 23 2018 11:32:28 +0000 Subject: Update to 2.18.2 --- diff --git a/.gitignore b/.gitignore index bdc5405..a3696a3 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /devscripts_2.17.11.tar.xz /devscripts_2.17.12.tar.xz /devscripts_2.18.1.tar.xz +/devscripts_2.18.2.tar.xz diff --git a/devscripts.spec b/devscripts.spec index 7e8e545..28c86e6 100644 --- a/devscripts.spec +++ b/devscripts.spec @@ -1,5 +1,5 @@ Name: devscripts -Version: 2.18.1 +Version: 2.18.2 Release: 1%{?dist} Summary: Scripts for Debian Package maintainers @@ -12,7 +12,6 @@ Patch0: devscripts_docbook.patch Patch1: devscripts_install-layout.patch # Install some additional man pages Patch2: devscripts_install-man.patch -Patch3: devscripts_unknown_experimental.patch BuildRequires: gcc BuildRequires: make @@ -168,6 +167,9 @@ rm -f %{buildroot}%{_datadir}/bash-completion/completions/bts # Empty %changelog +* Mon Apr 23 2018 Sandro Mani - 2.18.2-1 +- Update to 2.18.2 + * Wed Mar 07 2018 Sandro Mani - 2.18.1-1 - Update to 2.18.1 diff --git a/devscripts_docbook.patch b/devscripts_docbook.patch index c2008a1..a1d7174 100644 --- a/devscripts_docbook.patch +++ b/devscripts_docbook.patch @@ -1,6 +1,6 @@ -diff -rupN devscripts-2.18.1/po4a/Makefile devscripts-2.18.1-new/po4a/Makefile ---- devscripts-2.18.1/po4a/Makefile 2017-10-01 17:57:17.000000000 +0200 -+++ devscripts-2.18.1-new/po4a/Makefile 2018-03-07 10:59:25.816905867 +0100 +diff -rupN devscripts-2.18.2/po4a/Makefile devscripts-2.18.2-new/po4a/Makefile +--- devscripts-2.18.2/po4a/Makefile 2017-10-01 17:57:17.000000000 +0200 ++++ devscripts-2.18.2-new/po4a/Makefile 2018-04-23 13:25:06.654949463 +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,9 +19,9 @@ diff -rupN devscripts-2.18.1/po4a/Makefile devscripts-2.18.1-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.18.1/scripts/Makefile devscripts-2.18.1-new/scripts/Makefile ---- devscripts-2.18.1/scripts/Makefile 2018-03-06 15:42:39.000000000 +0100 -+++ devscripts-2.18.1-new/scripts/Makefile 2018-03-07 10:59:25.816905867 +0100 +diff -rupN devscripts-2.18.2/scripts/Makefile devscripts-2.18.2-new/scripts/Makefile +--- devscripts-2.18.2/scripts/Makefile 2018-03-12 11:16:02.000000000 +0100 ++++ devscripts-2.18.2-new/scripts/Makefile 2018-04-23 13:25:06.655949462 +0200 @@ -61,7 +61,7 @@ endif pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@ %.1: %.dbk diff --git a/devscripts_install-layout.patch b/devscripts_install-layout.patch index e713e3c..48198d3 100644 --- a/devscripts_install-layout.patch +++ b/devscripts_install-layout.patch @@ -1,6 +1,6 @@ -diff -rupN devscripts-2.18.1/scripts/Makefile devscripts-2.18.1-new/scripts/Makefile ---- devscripts-2.18.1/scripts/Makefile 2018-03-07 10:59:25.836905866 +0100 -+++ devscripts-2.18.1-new/scripts/Makefile 2018-03-07 10:59:25.838905866 +0100 +diff -rupN devscripts-2.18.2/scripts/Makefile devscripts-2.18.2-new/scripts/Makefile +--- devscripts-2.18.2/scripts/Makefile 2018-04-23 13:25:06.673949461 +0200 ++++ devscripts-2.18.2-new/scripts/Makefile 2018-04-23 13:25:06.675949461 +0200 @@ -108,7 +108,7 @@ clean: test: test_pl test_sh test_py diff --git a/devscripts_install-man.patch b/devscripts_install-man.patch index f54eb1d..9f61d37 100644 --- a/devscripts_install-man.patch +++ b/devscripts_install-man.patch @@ -1,6 +1,6 @@ -diff -rupN devscripts-2.18.1/scripts/Makefile devscripts-2.18.1-new/scripts/Makefile ---- devscripts-2.18.1/scripts/Makefile 2018-03-07 10:59:25.856905865 +0100 -+++ devscripts-2.18.1-new/scripts/Makefile 2018-03-07 10:59:25.858905864 +0100 +diff -rupN devscripts-2.18.2/scripts/Makefile devscripts-2.18.2-new/scripts/Makefile +--- devscripts-2.18.2/scripts/Makefile 2018-04-23 13:25:06.695949460 +0200 ++++ devscripts-2.18.2-new/scripts/Makefile 2018-04-23 13:25:06.697949460 +0200 @@ -122,5 +122,7 @@ install: all install -d $(DESTDIR)$(DATA_DIR) mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(DATA_DIR) diff --git a/devscripts_unknown_experimental.patch b/devscripts_unknown_experimental.patch deleted file mode 100644 index 5aaeb48..0000000 --- a/devscripts_unknown_experimental.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN devscripts-2.18.1/scripts/git-deborig.pl devscripts-2.18.1-new/scripts/git-deborig.pl ---- devscripts-2.18.1/scripts/git-deborig.pl 2018-03-06 15:42:39.000000000 +0100 -+++ devscripts-2.18.1-new/scripts/git-deborig.pl 2018-03-07 10:59:25.879905863 +0100 -@@ -61,7 +61,7 @@ B was written by Sean Whitt - - use strict; - use warnings; --no warnings "experimental::smartmatch"; -+no if $] >= 5.018, 'warnings', 'experimental::smartmatch'; - - use Git::Wrapper; - use Dpkg::Changelog::Parse; diff --git a/sources b/sources index b036ebf..35c8dba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (devscripts_2.18.1.tar.xz) = d2043b1e399cc0eece2eb9023b9b93480cc0bf270fc7dae45d1ba7eae0744e74cf0dce286787f7a30b4aafbe85e7ff282ea71f29f3cc011c9ef05e626cf03b22 +SHA512 (devscripts_2.18.2.tar.xz) = a68e9eccb5662b1ae0860b3f6cdc812a3105df83cd36f4b98b339ba1637a165f45b06acfb9dbadcf1055b65a4d5aa0780c1b921ed422ed1f0334735adadf4b6a