[Pkg-dns-devel] Bug#809055: unbound: diff for NMU version 1.5.7-1.1

[Chris Boot]

Control: tags 809055 + patch
Control: tags 809055 + pending

Dear maintainer,

I've prepared an NMU for unbound (versioned as 1.5.7-1.1) and will
shortly upload it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

I have also pushed the changes to a Git repo on Alioth, keeping it
separate from yours in case you wish to do this differently:

https://anonscm.debian.org/git/users/bootc/unbound.git
git://anonscm.debian.org/users/bootc/unbound.git

Regards,
Chris

diff -Nru unbound-1.5.7/debian/changelog unbound-1.5.7/debian/changelog
--- unbound-1.5.7/debian/changelog	2015-12-12 20:08:27.000000000 +0000
+++ unbound-1.5.7/debian/changelog	2016-02-21 15:27:15.000000000 +0000
@@ -1,3 +1,13 @@
+unbound (1.5.7-1.1) unstable; urgency=medium
+
+  [ Chris Boot ]
+  * Non-maintainer upload.
+
+  [ Robert Edmonds ]
+  * [2372c14c] Makefile.in: Pass PYTHON_CPPFLAGS to swig instead of CPPFLAGS (Closes: #809055)
+
+ -- Chris Boot <bootc at bootc.net>  Sun, 21 Feb 2016 15:27:06 +0000
+
 unbound (1.5.7-1) unstable; urgency=medium
 
   * [3cf7971b] debian/control: Vcs-Browser should point to cgit
diff -Nru unbound-1.5.7/debian/patches/debian-changes unbound-1.5.7/debian/patches/debian-changes
--- unbound-1.5.7/debian/patches/debian-changes	2015-12-12 20:11:09.000000000 +0000
+++ unbound-1.5.7/debian/patches/debian-changes	2016-02-21 15:27:38.000000000 +0000
@@ -5,13 +5,15 @@
  information below has been extracted from the changelog. Adjust it or drop
  it.
  .
- unbound (1.5.7-1) unstable; urgency=medium
+ unbound (1.5.7-1.1) unstable; urgency=medium
  .
-   * [3cf7971b] debian/control: Vcs-Browser should point to cgit
-     (Closes: #804437)
-   * [66955294] Imported Upstream version 1.5.7
-Author: Robert Edmonds <edmonds at debian.org>
-Bug-Debian: https://bugs.debian.org/804437
+   [ Chris Boot ]
+   * Non-maintainer upload.
+ .
+   [ Robert Edmonds ]
+   * [2372c14c] Makefile.in: Pass PYTHON_CPPFLAGS to swig instead of CPPFLAGS (Closes: #809055)
+Author: Chris Boot <bootc at bootc.net>
+Bug-Debian: https://bugs.debian.org/809055
 
 ---
 The information above should follow the Patch Tagging Guidelines, please
@@ -26,6 +28,32 @@
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
+--- unbound-1.5.7.orig/Makefile.in
++++ unbound-1.5.7/Makefile.in
+@@ -54,6 +54,7 @@ LEX=@LEX@
+ STRIP=@STRIP@
+ CC=@CC@
+ CPPFLAGS=-I. @CPPFLAGS@
++PYTHON_CPPFLAGS=-I. @PYTHON_CPPFLAGS@
+ CFLAGS=@CFLAGS@
+ LDFLAGS=@LDFLAGS@
+ LIBS=@LIBS@
+@@ -389,13 +390,13 @@ pythonmod.lo pythonmod.o: $(srcdir)/pyth
+ 
+ pythonmod/interface.h:	$(srcdir)/pythonmod/interface.i config.h
+ 	@-if test ! -d pythonmod; then $(INSTALL) -d pythonmod; fi
+-	$(SWIG) $(CPPFLAGS) -o $@ -python $(srcdir)/pythonmod/interface.i
++	$(SWIG) $(PYTHON_CPPFLAGS) -o $@ -python $(srcdir)/pythonmod/interface.i
+ 
+ libunbound_wrap.lo libunbound_wrap.o: libunbound/python/libunbound_wrap.c \
+ 	unbound.h
+ libunbound/python/libunbound_wrap.c:	$(srcdir)/libunbound/python/libunbound.i unbound.h
+ 	@-if test ! -d libunbound/python; then $(INSTALL) -d libunbound/python; fi
+-	$(SWIG) -python -o $@ $(CPPFLAGS) -DPY_MAJOR_VERSION=$(PY_MAJOR_VERSION) $(srcdir)/libunbound/python/libunbound.i
++	$(SWIG) -python -o $@ $(PYTHON_CPPFLAGS) -DPY_MAJOR_VERSION=$(PY_MAJOR_VERSION) $(srcdir)/libunbound/python/libunbound.i
+ 
+ # Pyunbound python unbound wrapper
+ _unbound.la:	libunbound_wrap.lo libunbound.la
 --- unbound-1.5.7.orig/acx_python.m4
 +++ unbound-1.5.7/acx_python.m4
 @@ -43,7 +43,12 @@ $ac_distutils_result])