Bug#809837: hp2xx: diff for NMU version 3.4.4-10.1

[Tobias Frost]

Control: tags 809837 + patch
Control: tags 809837 + pending

Dear maintainer,

I've prepared an NMU for hp2xx (versioned as 3.4.4-10.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.
diff -u hp2xx-3.4.4/debian/changelog hp2xx-3.4.4/debian/changelog
--- hp2xx-3.4.4/debian/changelog
+++ hp2xx-3.4.4/debian/changelog
@@ -1,3 +1,12 @@
+hp2xx (3.4.4-10.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Libpng  1.6 transition:
+    - FTBFS Fix for libpng1.6, see 007_libpng.patch (Closes: #809837)
+    - Update B-D to libpng-dev
+
+ -- Tobias Frost <t...@debian.org>  Mon, 18 Jan 2016 07:50:38 +0100
+
 hp2xx (3.4.4-10) unstable; urgency=high
 
   * include patch by Martin Kroeker to fix crashes found by Jodie Cunningham
diff -u hp2xx-3.4.4/debian/control hp2xx-3.4.4/debian/control
--- hp2xx-3.4.4/debian/control
+++ hp2xx-3.4.4/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Christian T. Steigies <c...@debian.org>
 Standards-Version: 3.9.5
-Build-Depends: cdbs, debhelper (>=5.0.0), texinfo, libtiff-dev, 
libpng12-0-dev, zlib1g-dev, libjpeg-dev, libx11-dev
+Build-Depends: cdbs, debhelper (>=5.0.0), texinfo, libtiff-dev, libpng-dev, 
zlib1g-dev, libjpeg-dev, libx11-dev
 
 Package: hp2xx
 Architecture: any
only in patch2:
unchanged:
--- hp2xx-3.4.4.orig/.pc/.quilt_patches
+++ hp2xx-3.4.4/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
only in patch2:
unchanged:
--- hp2xx-3.4.4.orig/.pc/.quilt_series
+++ hp2xx-3.4.4/.pc/.quilt_series
@@ -0,0 +1 @@
+series
only in patch2:
unchanged:
--- hp2xx-3.4.4.orig/.pc/.version
+++ hp2xx-3.4.4/.pc/.version
@@ -0,0 +1 @@
+2
only in patch2:
unchanged:
--- hp2xx-3.4.4.orig/debian/patches/007_libpng.patch
+++ hp2xx-3.4.4/debian/patches/007_libpng.patch
@@ -0,0 +1,25 @@
+Description: Fix for libpng 1.6 new API
+Author: Tobias Frost <t...@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809837
+Last-Update: 2016-01-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/sources/png.c
++++ b/sources/png.c
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include "to_png.h"
++#include <zlib.h>
+ #include <png.h>
+ 
+ #define PDNCOL 256
+@@ -36,7 +37,7 @@
+       }
+ 
+       /* set up error handlimg for libpng */
+-      if (setjmp(png_ptr->jmpbuf)) {
++      if (setjmp(png_jmpbuf(png_ptr))) {
+               png_destroy_write_struct(&png_ptr, &info_ptr);
+               return;
+       }