Bug#638812: whitedune: diff for NMU version 0.30.10-1.4

[Tobias Frost]

Control: tags 638812 + pending

Dear maintainer,

I've prepared an NMU for whitedune (versioned as 0.30.10-1.4) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru whitedune-0.30.10/debian/changelog whitedune-0.30.10/debian/changelog
--- whitedune-0.30.10/debian/changelog	2014-03-15 04:43:19.000000000 +0100
+++ whitedune-0.30.10/debian/changelog	2016-01-07 00:46:49.000000000 +0100
@@ -1,3 +1,12 @@
+whitedune (0.30.10-1.4) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with libpng 1.5", applying the patch from Nobuhiro
+    (Closes: #638812)
+  * Add d/clean to remove created files
+
+ -- Tobias Frost <tobi at debian.org>  Thu, 07 Jan 2016 00:08:20 +0100
+
 whitedune (0.30.10-1.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru whitedune-0.30.10/debian/clean whitedune-0.30.10/debian/clean
--- whitedune-0.30.10/debian/clean	1970-01-01 01:00:00.000000000 +0100
+++ whitedune-0.30.10/debian/clean	2016-01-07 00:43:44.000000000 +0100
@@ -0,0 +1,6 @@
+config.guess
+config.sub
+src/lexer.cpp
+src/parser.cpp
+src/swt/rc/y.tab.h
+src/y.tab.h
diff -Nru whitedune-0.30.10/debian/patches/debian-changes-0.30.10-1.1 whitedune-0.30.10/debian/patches/debian-changes-0.30.10-1.1
--- whitedune-0.30.10/debian/patches/debian-changes-0.30.10-1.1	1970-01-01 01:00:00.000000000 +0100
+++ whitedune-0.30.10/debian/patches/debian-changes-0.30.10-1.1	2016-01-07 00:07:49.000000000 +0100
@@ -0,0 +1,40 @@
+Description: Upstream changes introduced in version 0.30.10-1.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ whitedune (0.30.10-1.1) unstable; urgency=low
+ .
+   * Non-maintainer upload.
+   * libpng 15 transition.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- whitedune-0.30.10.orig/src/pngLoad.c
++++ whitedune-0.30.10/src/pngLoad.c
+@@ -139,7 +139,11 @@ static int pngreadstr( FILE *fp,
+     * the normal method of doing things with libpng).  REQUIRED unless you
+     * set up your own error handlers in the png_create_read_struct() earlier.
+     */
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++  if (setjmp(png_jmpbuf((png_ptr))))
++#else
+   if (setjmp(png_ptr->jmpbuf))
++#endif
+     {
+       /* If we get here, we had a problem reading the file */
+       return 0;
diff -Nru whitedune-0.30.10/debian/patches/series whitedune-0.30.10/debian/patches/series
--- whitedune-0.30.10/debian/patches/series	2011-04-29 21:43:55.000000000 +0200
+++ whitedune-0.30.10/debian/patches/series	2016-01-07 00:07:49.000000000 +0100
@@ -1 +1,2 @@
 debian-changes-0.30.10-1
+debian-changes-0.30.10-1.1