diff -u visualboyadvance-1.8.0.dfsg/debian/control visualboyadvance-1.8.0.dfsg/debian/control
--- visualboyadvance-1.8.0.dfsg/debian/control
+++ visualboyadvance-1.8.0.dfsg/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders: Ola Lundqvist <opal@debian.org>, Nick Ellery <nick.ellery@ubuntu.com>, Evgeni Golov <evgeni@debian.org>
 Build-Depends: debhelper (>= 5), autotools-dev, libsdl1.2-dev, zlib1g-dev,
- nasm [i386 kfreebsd-i386 hurd-i386 lpia], libtool, libpng12-dev | libpng-dev,
+ nasm [i386 kfreebsd-i386 hurd-i386 lpia], libtool, libpng-dev (>= 1.5),
  libx11-dev, libxt-dev, x11proto-core-dev, dpatch, docbook-to-man,
  libgtkmm-2.4-dev, libglademm-2.4-dev, automake, help2man
 Standards-Version: 3.8.4
diff -u visualboyadvance-1.8.0.dfsg/debian/changelog visualboyadvance-1.8.0.dfsg/debian/changelog
--- visualboyadvance-1.8.0.dfsg/debian/changelog
+++ visualboyadvance-1.8.0.dfsg/debian/changelog
@@ -1,3 +1,10 @@
+visualboyadvance (1.8.0.dfsg-0.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with libpng 1.5.
+
+ -- Nobuhiro Iwamatsu <iwamatsu@nigauri.org>  Fri, 25 Nov 2011 01:08:08 +0900
+
 visualboyadvance (1.8.0.dfsg-0.1) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- visualboyadvance-1.8.0.dfsg.orig/src/Util.cpp
+++ visualboyadvance-1.8.0.dfsg/src/Util.cpp
@@ -87,7 +87,11 @@
     return false;
   }
 
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+  if (setjmp(png_jmpbuf(png_ptr))) {
+#else
   if(setjmp(png_ptr->jmpbuf)) {
+#endif
     png_destroy_write_struct(&png_ptr,NULL);
     fclose(fp);
     return false;