diff -Nru xsane-0.998/debian/patches/png15 xsane-0.998/debian/patches/png15
--- xsane-0.998/debian/patches/png15	1970-01-01 09:00:00.000000000 +0900
+++ xsane-0.998/debian/patches/png15	2012-03-19 10:33:48.000000000 +0900
@@ -0,0 +1,52 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ xsane (0.998-3+libpng151) unstable; urgency=low
+ .
+   * Build with libpng15.
+Author: Nobuhiro Iwamatsu <iwamatsu@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- xsane-0.998.orig/src/xsane-save.c
++++ xsane-0.998/src/xsane-save.c
+@@ -4928,8 +4928,11 @@ int xsane_save_png(FILE *outfile, int co
+     xsane_back_gtk_error(buf, TRUE);
+     return -1; /* error */
+   }
+-
++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
++  if ( setjmp( png_jmpbuf ( png_ptr ) ) )
++#else
+   if (setjmp(png_ptr->jmpbuf))
++#endif
+   {
+     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+     xsane_back_gtk_error(buf, TRUE);
+@@ -5119,7 +5122,11 @@ int xsane_save_png_16(FILE *outfile, int
+     return -1; /* error */
+   }
+ 
++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
++  if ( setjmp( png_jmpbuf ( png_ptr ) ) )
++#else
+   if (setjmp(png_ptr->jmpbuf))
++#endif
+   {
+     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
+     xsane_back_gtk_error(buf, TRUE);