diff -u briquolo-0.5.7/debian/changelog briquolo-0.5.7/debian/changelog
--- briquolo-0.5.7/debian/changelog
+++ briquolo-0.5.7/debian/changelog
@@ -1,3 +1,10 @@
+briquolo (0.5.7-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with libpng 1.5.
+
+ -- Nobuhiro Iwamatsu <iwamatsu@nigauri.org>  Thu, 24 Nov 2011 07:51:55 +0900
+
 briquolo (0.5.7-3) unstable; urgency=low
 
   * Update uploader email address.
diff -u briquolo-0.5.7/debian/control briquolo-0.5.7/debian/control
--- briquolo-0.5.7/debian/control
+++ briquolo-0.5.7/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders: Bradley Smith <bradsmith@debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, libpng12-dev, quilt
+Build-Depends: debhelper (>= 7), autotools-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, libpng-dev (>= 1.5), quilt
 Standards-Version: 3.8.0
 Homepage: http://briquolo.free.fr/
 Vcs-Git: git://git.debian.org/git/pkg-games/briquolo.git
only in patch2:
unchanged:
--- briquolo-0.5.7.orig/src/MOGL/MOGL_Image.cpp
+++ briquolo-0.5.7/src/MOGL/MOGL_Image.cpp
@@ -183,16 +183,24 @@
   info_ptr = png_create_info_struct(png_ptr);
   if (info_ptr == NULL)
   {
-    png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
-    return false;
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+    png_destroy_read_struct(&png_ptr, NULL, NULL);
+#else
+	png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+#endif
+	return false;
   }
 
   // On définie le setjmp (le saut effectué en cas d'erreur de la libpng)
   if (setjmp(png_jmpbuf(png_ptr)))
   {
     // On libère la mémoire
-    png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-    return false;
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+#else
+	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+#endif
+	return false;
   }
         
   // On initialise l'acces au fichier
@@ -235,7 +243,11 @@
   /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
   {
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+    png_set_expand_gray_1_2_4_to_8(png_ptr);
+#else
     png_set_gray_1_2_4_to_8(png_ptr);
+#endif
   }
   
   /* Expand paletted or RGB images with transparency to full alpha channels