diff -Nru xplanet-1.2.1/debian/changelog xplanet-1.2.1/debian/changelog --- xplanet-1.2.1/debian/changelog 2011-11-08 01:36:36.000000000 +0900 +++ xplanet-1.2.1/debian/changelog 2011-11-25 00:46:37.000000000 +0900 @@ -1,3 +1,10 @@ +xplanet (1.2.1-4.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with libpng 1.5. + + -- Nobuhiro Iwamatsu Fri, 25 Nov 2011 00:46:25 +0900 + xplanet (1.2.1-4.1) unstable; urgency=low * Non-maintainer upload. diff -Nru xplanet-1.2.1/debian/control xplanet-1.2.1/debian/control --- xplanet-1.2.1/debian/control 2011-11-08 01:36:20.000000000 +0900 +++ xplanet-1.2.1/debian/control 2011-11-25 00:47:08.000000000 +0900 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ruben Molina Build-Depends: debhelper (>= 7), autotools-dev, - libjpeg-dev, libpng12-dev | libpng-dev, libfreetype6-dev, + libjpeg-dev, libpng-dev (>= 1.5), libfreetype6-dev, libtiff4-dev, libgif-dev, libnetpbm10-dev, libpango1.0-dev, libx11-dev, libxss-dev, libxt-dev, ttf-freefont Standards-Version: 3.9.1 diff -Nru xplanet-1.2.1/debian/patches/libpng15.patch xplanet-1.2.1/debian/patches/libpng15.patch --- xplanet-1.2.1/debian/patches/libpng15.patch 1970-01-01 09:00:00.000000000 +0900 +++ xplanet-1.2.1/debian/patches/libpng15.patch 2011-11-25 00:54:56.000000000 +0900 @@ -0,0 +1,41 @@ +Description: + 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. + . + xplanet (1.2.1-4.2) unstable; urgency=low + . + * Non-maintainer upload. + * Fix FTBFS with libpng 1.5. +Author: Nobuhiro Iwamatsu + +--- +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: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- xplanet-1.2.1.orig/src/libimage/png.c ++++ xplanet-1.2.1/src/libimage/png.c +@@ -56,8 +56,11 @@ read_png(const char *filename, int *widt + fclose(infile); + return(0); + } +- ++#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_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); + fclose(infile); diff -Nru xplanet-1.2.1/debian/patches/series xplanet-1.2.1/debian/patches/series --- xplanet-1.2.1/debian/patches/series 2010-12-03 00:43:06.000000000 +0900 +++ xplanet-1.2.1/debian/patches/series 2011-11-25 00:55:19.000000000 +0900 @@ -3,3 +3,4 @@ gcc44-includes hyphen-used-as-minus-sign tsc-aspect-ratio +libpng15.patch