[clanlib] 02/03: Merge Tobias Frost's NMU.

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository clanlib.

commit ef95a4b9f34d677f423dd679ba2c7b4622a89931
Author: Stephen Kitt <steve at sk2.org>
Date:   Fri Jun 10 22:22:49 2016 +0200

    Merge Tobias Frost's NMU.
---
 debian/changelog                  |  8 ++++++++
 debian/control                    |  4 ++--
 debian/patches/410_libpng16.patch | 11 +++++++++++
 debian/patches/series             |  1 +
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d375ed8..cd3b10c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+clanlib (1.0~svn3827-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch for libpng1.6 (Closes: #649552)
+  * Update B-D to libpng-dev. (Closes: #662288)
+
+ -- Tobias Frost <tobi at debian.org>  Thu, 14 Jan 2016 21:16:16 +0100
+
 clanlib (1.0~svn3827-4) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 44d7f64..d2bf6e6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Sam Hocevar <sho at debian.org>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5.0), quilt, autoconf, automake, libtool, bzip2, libesd0-dev, libfreetype6-dev, libglu1-mesa-dev | libgl-dev, libjpeg-dev, libmikmod2-dev, libpng12-dev, libvorbis-dev (>= 1.0.0-3), libxt-dev, libxxf86vm-dev, pkg-config, zlib1g-dev, libxmu-dev, libxi-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, xsltproc, libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386]
+Build-Depends: debhelper (>= 5.0), quilt, autoconf, automake, libtool, bzip2, libesd0-dev, libfreetype6-dev, libglu1-mesa-dev | libgl-dev, libjpeg-dev, libmikmod2-dev, libpng-dev, libvorbis-dev (>= 1.0.0-3), libxt-dev, libxxf86vm-dev, pkg-config, zlib1g-dev, libxmu-dev, libxi-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, xsltproc, libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386]
 Build-Conflicts: libutahglx-dev
 Standards-Version: 3.8.3
 Homepage: http://www.clanlib.org/
@@ -57,7 +57,7 @@ Package: libclanlib-dev
 Section: libdevel
 Architecture: any
 Depends: libclanapp-1.0v5 (= ${binary:Version}), libclansdl-1.0v5 (= ${binary:Version}), ${misc:Depends}
-Recommends: libfreetype6-dev, libglu1-mesa-dev | xlibmesa-dev | libgl-dev, libjpeg-dev, libmikmod-dev, libpng12-0-dev, libvorbis-dev
+Recommends: libfreetype6-dev, libglu1-mesa-dev | xlibmesa-dev | libgl-dev, libjpeg-dev, libmikmod-dev, libpng-dev, libvorbis-dev
 Conflicts: clanlib0-common, libutahglx-dev, clanlib2 (<< 0.6.1-1-3), clanlib-dev
 Provides: clanlib-dev
 Replaces: clanlib-dev
diff --git a/debian/patches/410_libpng16.patch b/debian/patches/410_libpng16.patch
new file mode 100644
index 0000000..81a216f
--- /dev/null
+++ b/debian/patches/410_libpng16.patch
@@ -0,0 +1,11 @@
+--- a/Sources/Display/Providers/png_provider_generic.cpp
++++ b/Sources/Display/Providers/png_provider_generic.cpp
+@@ -107,7 +107,7 @@
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+ 		cl_assert(false);
+ 	}   
+-	if (setjmp(png_ptr->jmpbuf))
++	if (setjmp(png_jmpbuf(png_ptr)))
+ 	{
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ 		cl_assert(false);
diff --git a/debian/patches/series b/debian/patches/series
index 0970480..34aea3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 200_kfreebsd.diff
 300_log_h.diff
 400_test_subdirs_signals.diff
+410_libpng16.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/clanlib.git