diff -Nru grace-5.1.22/debian/changelog grace-5.1.22/debian/changelog
--- grace-5.1.22/debian/changelog	2011-04-26 06:46:49.000000000 +0900
+++ grace-5.1.22/debian/changelog	2011-08-07 14:49:44.000000000 +0900
@@ -1,3 +1,10 @@
+grace (1:5.1.22-10.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * libpng 1.5 transition.
+
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Sun, 07 Aug 2011 14:49:10 +0900
+
 grace (1:5.1.22-10) unstable; urgency=low
 
   * patches/binary_nostrip.diff: Don't strip the grace binary unconditionally,
diff -Nru grace-5.1.22/debian/patches/debian-changes-1:5.1.22-10.1 grace-5.1.22/debian/patches/debian-changes-1:5.1.22-10.1
--- grace-5.1.22/debian/patches/debian-changes-1:5.1.22-10.1	1970-01-01 09:00:00.000000000 +0900
+++ grace-5.1.22/debian/patches/debian-changes-1:5.1.22-10.1	2011-08-07 14:57:09.000000000 +0900
@@ -0,0 +1,51 @@
+Description: Upstream changes introduced in version 1:5.1.22-10.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ grace (1:5.1.22-10.1) unstable; urgency=low
+ .
+   * Non-maintainer upload.
+   * libpng1.5 transition.
+ .
+ The person named in the Author field signed this changelog entry.
+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>
+
+--- grace-5.1.22.orig/src/rstdrv.c
++++ grace-5.1.22/src/rstdrv.c
+@@ -54,6 +54,9 @@
+ 
+ #ifdef HAVE_LIBPNG
+ #  include <png.h>
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++#  include <zlib.h>
++#endif
+ #endif
+ 
+ #ifndef NONE_GUI
+@@ -884,8 +887,11 @@ static void rstImagePng(gdImagePtr ihand
+         png_destroy_write_struct(&png_ptr, NULL);
+         return;
+     }
+-
++#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, &info_ptr);
+         return;
+     }
diff -Nru grace-5.1.22/debian/patches/series grace-5.1.22/debian/patches/series
--- grace-5.1.22/debian/patches/series	2011-04-26 06:45:55.000000000 +0900
+++ grace-5.1.22/debian/patches/series	2011-08-07 14:50:17.000000000 +0900
@@ -9,3 +9,4 @@
 non-resizable-dialogs.diff
 nonlinear_extended.diff
 binary_nostrip.diff
+debian-changes-1:5.1.22-10.1