Bug#648126: simage: diff for NMU version 1.7.1~2c958a6.dfsg-2.1

[Tobias Frost]

Control: tags 648126 + patch
Control: tags 648126 + pending

Dear maintainer,

I've prepared an NMU for simage (versioned as 1.7.1~2c958a6.dfsg-2.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru simage-1.7.1~2c958a6.dfsg/debian/changelog simage-1.7.1~2c958a6.dfsg/debian/changelog
--- simage-1.7.1~2c958a6.dfsg/debian/changelog	2013-10-26 22:10:18.000000000 +0200
+++ simage-1.7.1~2c958a6.dfsg/debian/changelog	2016-01-07 13:12:06.000000000 +0100
@@ -1,3 +1,10 @@
+simage (1.7.1~2c958a6.dfsg-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS for libpng 1.6 (Closes: #648126)
+
+ -- Tobias Frost <tobi at debian.org>  Thu, 07 Jan 2016 13:03:46 +0100
+
 simage (1.7.1~2c958a6.dfsg-2) unstable; urgency=low
 
   * [c1de859] Build-depend on libtiff-dev rather than libtiff4-dev.
diff -Nru simage-1.7.1~2c958a6.dfsg/debian/patches/libpng16.patch simage-1.7.1~2c958a6.dfsg/debian/patches/libpng16.patch
--- simage-1.7.1~2c958a6.dfsg/debian/patches/libpng16.patch	1970-01-01 01:00:00.000000000 +0100
+++ simage-1.7.1~2c958a6.dfsg/debian/patches/libpng16.patch	2016-01-07 13:12:15.000000000 +0100
@@ -0,0 +1,17 @@
+Description: Fix FTBFS with changed libpng 1.6 api
+Author: Tobias Frost <tobi at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648126
+Last-Update: 2016-01-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/simage_png.c
++++ b/src/simage_png.c
+@@ -342,7 +342,7 @@
+   /* Set error handling.  REQUIRED if you aren't supplying your own
+    * error hadnling functions in the png_create_write_struct() call.
+    */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     /* If we get here, we had a problem reading the file */
+     fclose(fp);
+     png_destroy_write_struct(&png_ptr,  (png_infopp)info_ptr);
diff -Nru simage-1.7.1~2c958a6.dfsg/debian/patches/series simage-1.7.1~2c958a6.dfsg/debian/patches/series
--- simage-1.7.1~2c958a6.dfsg/debian/patches/series	2013-10-26 22:01:20.000000000 +0200
+++ simage-1.7.1~2c958a6.dfsg/debian/patches/series	2016-01-07 13:12:19.000000000 +0100
@@ -1 +1,2 @@
 01_configure-shared-static.patch
+libpng16.patch