diff -Nru matanza-0.13+ds1/debian/changelog matanza-0.13+ds1/debian/changelog
--- matanza-0.13+ds1/debian/changelog	2011-01-11 19:14:20.000000000 +0900
+++ matanza-0.13+ds1/debian/changelog	2011-08-07 23:52:41.000000000 +0900
@@ -1,3 +1,10 @@
+matanza (0.13+ds1-2.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * libpng 1.5 transition.
+
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Sun, 07 Aug 2011 23:52:27 +0900
+
 matanza (0.13+ds1-2) experimental; urgency=low
 
   * New maintainer.  Closes: #442045
diff -Nru matanza-0.13+ds1/debian/patches/debian-changes-0.13+ds1-2.1 matanza-0.13+ds1/debian/patches/debian-changes-0.13+ds1-2.1
--- matanza-0.13+ds1/debian/patches/debian-changes-0.13+ds1-2.1	1970-01-01 09:00:00.000000000 +0900
+++ matanza-0.13+ds1/debian/patches/debian-changes-0.13+ds1-2.1	2011-08-07 23:56:00.000000000 +0900
@@ -0,0 +1,41 @@
+Description: Upstream changes introduced in version 0.13+ds1-2.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:
+ .
+ matanza (0.13+ds1-2.1) experimental; urgency=low
+ .
+   * Non-maintainer upload.
+   * libpng 1.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>
+
+--- matanza-0.13+ds1.orig/matanza.w
++++ matanza-0.13+ds1/matanza.w
+@@ -9822,8 +9822,11 @@ mat_png_load ( char const *path )
+       png_destroy_read_struct(&png_ptr, NULL, NULL);
+       exit(EXIT_FAILURE);
+     }
+-
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++  if (setjmp(png_jmpbuf((png_ptr))))
++#else
+   if (setjmp(png_ptr->jmpbuf))
++#endif
+     {
+       fprintf(stderr, "%s: %s\n", program_name, strerror(errno));
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
diff -Nru matanza-0.13+ds1/debian/patches/series matanza-0.13+ds1/debian/patches/series
--- matanza-0.13+ds1/debian/patches/series	2011-01-11 19:14:20.000000000 +0900
+++ matanza-0.13+ds1/debian/patches/series	2011-08-07 23:56:00.000000000 +0900
@@ -1,3 +1,4 @@
 01-fix-verbose-macro.patch
 02-typos.patch
 03-cppcheck.patch
+debian-changes-0.13+ds1-2.1