[SCM] WarMUX PKG branch, master, updated. 26a7d763eca94a4a08530e93f95f950d1441712c

[Felix Geyer]

The following commit has been merged in the master branch:
commit e00d72bd19b68c0dced0f66baeb1f8568d930dd7
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sat Mar 10 16:42:52 2012 +0100

    Fix FTBFS with libpng 1.5.
    
    Closes: #649788

diff --git a/debian/changelog b/debian/changelog
index 17f3b59..99aab8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ warmux (1:11.04.1+repack-2) UNRELEASED; urgency=low
   * Depend on fonts-vlgothic instead of ttf-vlgothic as the latter is a
     transitional package.
   * Move all transitional packages to section oldlibs and priority extra.
+  * Fix FTBFS with libpng 1.5. (Closes: #649788)
+    - Add 05_fix_build_libpng15.patch
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Sun, 16 Oct 2011 10:22:32 +0200
 
diff --git a/debian/patches/05_fix_build_libpng15.patch b/debian/patches/05_fix_build_libpng15.patch
new file mode 100644
index 0000000..2a1365c
--- /dev/null
+++ b/debian/patches/05_fix_build_libpng15.patch
@@ -0,0 +1,14 @@
+Description: Fix FTBFS with libpng 1.5.
+Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Bug-Debian: http://bugs.debian.org/649788
+
+--- warmux-11.04.1+repack.orig/src/graphic/surface.cpp
++++ warmux-11.04.1+repack/src/graphic/surface.cpp
+@@ -25,6 +25,7 @@
+ #include <SDL_image.h>
+ #include <SDL_rotozoom.h>
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include "graphic/surface.h"
+ #include "tool/math_tools.h"
diff --git a/debian/patches/series b/debian/patches/series
index c7e6ee0..eedd87c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_desktop_file.patch
 03_respect_build_flags_from_env.patch
 04_fix_build_kfreebsd.patch
+05_fix_build_libpng15.patch

-- 
WarMUX PKG