[devscripts] Update to 2.14.6

[Sandro Mani]

commit 3cfbecee2f7be07508c7f98da322f51c69a58f3f
Author: Sandro Mani <manisandro at gmail.com>
Date:   Wed Aug 6 22:22:32 2014 +0200

    Update to 2.14.6

 .gitignore                      |    1 +
 devscripts.spec                 |    7 +++++--
 devscripts_docbook.patch        |   18 +++++++++---------
 devscripts_install-layout.patch |    8 ++++----
 devscripts_install-man.patch    |   10 +++++-----
 sources                         |    2 +-
 6 files changed, 25 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f514f2a..ed4170c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /devscripts_2.14.3.tar.xz
 /devscripts_2.14.4.tar.xz
 /devscripts_2.14.5.tar.xz
+/devscripts_2.14.6.tar.xz
diff --git a/devscripts.spec b/devscripts.spec
index 6f6c630..f326b9a 100644
--- a/devscripts.spec
+++ b/devscripts.spec
@@ -1,5 +1,5 @@
 Name:           devscripts
-Version:        2.14.5
+Version:        2.14.6
 Release:        1%{?dist}
 Summary:        Scripts for Debian Package maintainers
 
@@ -62,7 +62,7 @@ sed -i 's|/usr/lib/devscripts/libvfork.so.0|%{_libdir}/%{name}/libvfork.so.0|g'
 
 %build
 # LIBDIR determines where libvfork gets installed, see scripts/Makefile for LIBDIR
-make %{?_smp_mflags} LIBDIR=%{_libdir}/%{name} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
+make %{?_smp_mflags} LIBDIR=%{_libdir}/%{name} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
 
 
 %install
@@ -95,6 +95,9 @@ rm -rf %{buildroot}%{_datadir}/doc
 
 
 %changelog
+* Wed Aug 06 2014 Sandro Mani <manisandro at gmail.com> - 2.14.6-1
+- Update to 2.14.6
+
 * Wed Jun 11 2014 Sandro Mani <manisandro at gmail.com> - 2.14.5-1
 - Update to 2.14.5
 
diff --git a/devscripts_docbook.patch b/devscripts_docbook.patch
index 027365b..61eb537 100644
--- a/devscripts_docbook.patch
+++ b/devscripts_docbook.patch
@@ -1,7 +1,7 @@
-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 -rupN devscripts-2.14.6/po4a/Makefile devscripts-2.14.6-new/po4a/Makefile
+--- devscripts-2.14.6/po4a/Makefile	2014-08-05 04:34:56.000000000 +0200
++++ devscripts-2.14.6-new/po4a/Makefile	2014-08-06 22:19:42.963624425 +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
  	xsltproc --nonet -o $@ \
@@ -10,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 $@ \
@@ -19,10 +19,10 @@ 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 -rupN devscripts-2.14.6/scripts/Makefile devscripts-2.14.6-new/scripts/Makefile
+--- devscripts-2.14.6/scripts/Makefile	2014-08-05 04:34:56.000000000 +0200
++++ devscripts-2.14.6-new/scripts/Makefile	2014-08-06 22:19:42.963624425 +0200
+@@ -64,7 +64,7 @@ endif
  	pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
  %.1: %.dbk
  	xsltproc --nonet -o $@ \
diff --git a/devscripts_install-layout.patch b/devscripts_install-layout.patch
index b18fadf..f92b025 100644
--- a/devscripts_install-layout.patch
+++ b/devscripts_install-layout.patch
@@ -1,7 +1,7 @@
-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:05:52.040168029 +0200
-@@ -92,7 +92,7 @@ test:
+diff -rupN devscripts-2.14.6/scripts/Makefile devscripts-2.14.6-new/scripts/Makefile
+--- devscripts-2.14.6/scripts/Makefile	2014-08-05 04:34:56.000000000 +0200
++++ devscripts-2.14.6-new/scripts/Makefile	2014-08-06 22:21:05.050620777 +0200
+@@ -95,7 +95,7 @@ test:
  	$(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n))
  
  install: all
diff --git a/devscripts_install-man.patch b/devscripts_install-man.patch
index bbd9483..f219f50 100644
--- a/devscripts_install-man.patch
+++ b/devscripts_install-man.patch
@@ -1,7 +1,7 @@
-diff -rupN devscripts-2.13.4/scripts/Makefile devscripts-2.13.4-new/scripts/Makefile
---- 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
-@@ -27,6 +27,7 @@ GEN_MAN1S += devscripts.1
+diff -rupN devscripts-2.14.6/scripts/Makefile devscripts-2.14.6-new/scripts/Makefile
+--- devscripts-2.14.6/scripts/Makefile	2014-08-05 04:34:56.000000000 +0200
++++ devscripts-2.14.6-new/scripts/Makefile	2014-08-06 22:21:35.668619417 +0200
+@@ -27,6 +27,7 @@ GEN_MAN1S += devscripts.1 mk-origtargz.1
  BINDIR = /usr/bin
  LIBDIR = /usr/lib/devscripts
  BIN_LIBDIR = /usr/lib/devscripts
@@ -9,7 +9,7 @@ diff -rupN devscripts-2.13.4/scripts/Makefile devscripts-2.13.4-new/scripts/Make
  
  all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS) $(COMPLETION)
  
-@@ -103,5 +104,7 @@ install: all
+@@ -106,5 +107,7 @@ install: all
  	install -dD $(DESTDIR)$(PERLMOD_DIR)
  	mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(PERLMOD_DIR)
  	cp debpkg-wrapper $(DESTDIR)$(BINDIR)/debpkg
diff --git a/sources b/sources
index 7db46fa..5cccfe3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5271ab6e12349865dd7ab686f1010808  devscripts_2.14.5.tar.xz
+3040c0271f700e147188a524038c9ad1  devscripts_2.14.6.tar.xz