[Debian-med-packaging] Bug#809897: ctsim: diff for NMU version 5.2.0-2.1

[Tobias Frost]

Control: tags 809897 + patch

Dear maintainer,

I've prepared an NMU for ctsim (versioned as 5.2.0-2.1). The diff
is attached to this message.

Regards.
diff -Nru ctsim-5.2.0/debian/changelog ctsim-5.2.0/debian/changelog
--- ctsim-5.2.0/debian/changelog	2014-08-11 14:51:45.000000000 +0200
+++ ctsim-5.2.0/debian/changelog	2016-01-24 12:58:10.000000000 +0100
@@ -1,3 +1,10 @@
+ctsim (5.2.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with libpng16" (Closes: #809897)
+
+ -- Tobias Frost <tobi at debian.org>  Sun, 24 Jan 2016 12:58:10 +0100
+
 ctsim (5.2.0-2) unstable; urgency=medium
 
   [ Olly Betts ]
diff -Nru ctsim-5.2.0/debian/patches/libpng16.patch ctsim-5.2.0/debian/patches/libpng16.patch
--- ctsim-5.2.0/debian/patches/libpng16.patch	1970-01-01 01:00:00.000000000 +0100
+++ ctsim-5.2.0/debian/patches/libpng16.patch	2016-01-24 12:52:22.000000000 +0100
@@ -0,0 +1,20 @@
+--- a/libctsim/imagefile.cpp
++++ b/libctsim/imagefile.cpp
+@@ -1565,7 +1565,7 @@
+     return false;
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+     fclose(fp);
+     return false;
+@@ -1815,7 +1815,7 @@
+     return false;
+   }
+ 
+-  if (setjmp (png_ptr->jmpbuf)) {
++  if (setjmp (png_jmpbuf(png_ptr))) {
+     png_destroy_write_struct (&png_ptr, &info_ptr);
+     fclose (fp);
+     return false;
diff -Nru ctsim-5.2.0/debian/patches/series ctsim-5.2.0/debian/patches/series
--- ctsim-5.2.0/debian/patches/series	2014-08-11 14:51:45.000000000 +0200
+++ ctsim-5.2.0/debian/patches/series	2016-01-24 12:43:39.000000000 +0100
@@ -2,3 +2,4 @@
 cope_with_existing_makefile.patch
 prevent_symlinking_on_build_host_dir.patch
 spelling.patch
+libpng16.patch