[med-svn] [ctsim] 02/02: Inject changes by Tobias Frost <tobi at debian.org>

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository ctsim.

commit 43340fe10c39a09e6f81a66e1bcc79ddf9cafa89
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jan 26 09:12:15 2016 +0100

    Inject changes by Tobias Frost <tobi at debian.org>
---
 debian/changelog              |  7 ++++---
 debian/control                |  4 ++--
 debian/patches/libpng16.patch | 20 ++++++++++++++++++++
 debian/patches/series         |  1 +
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d95493b..67b174b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-ctsim (5.2.0-3) UNRELEASED; urgency=medium
+ctsim (5.2.0-2.1) unstable; urgency=medium
 
-  * cme fix dpkg-control
+  * Non-maintainer upload.
+  * Fix "FTBFS with libpng16" (Closes: #809897)
 
- -- Andreas Tille <tille at debian.org>  Mon, 04 Jan 2016 22:10:40 +0100
+ -- Tobias Frost <tobi at debian.org>  Sun, 24 Jan 2016 12:58:10 +0100
 
 ctsim (5.2.0-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index f302a66..5d0f642 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Build-Depends: debhelper (>= 9),
                libgtk2.0-dev,
                autotools-dev,
                dh-autoreconf
-Standards-Version: 3.9.6
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/ctsim.git
+Standards-Version: 3.9.5
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/ctsim.git
 Vcs-Git: git://anonscm.debian.org/debian-med/ctsim.git
 Homepage: http://www.ctsim.org
 
diff --git a/debian/patches/libpng16.patch b/debian/patches/libpng16.patch
new file mode 100644
index 0000000..5427d88
--- /dev/null
+++ b/debian/patches/libpng16.patch
@@ -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 --git a/debian/patches/series b/debian/patches/series
index 0caf9f4..bef270a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ wx3.0-compat.patch
 cope_with_existing_makefile.patch
 prevent_symlinking_on_build_host_dir.patch
 spelling.patch
+libpng16.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ctsim.git