diff -u devil-1.7.8/debian/changelog devil-1.7.8/debian/changelog --- devil-1.7.8/debian/changelog +++ devil-1.7.8/debian/changelog @@ -1,3 +1,10 @@ +devil (1.7.8-6.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with libpng 1.5. + + -- Nobuhiro Iwamatsu Thu, 24 Nov 2011 09:00:47 +0900 + devil (1.7.8-6.1) unstable; urgency=low * Non-maintainer upload. diff -u devil-1.7.8/debian/control devil-1.7.8/debian/control --- devil-1.7.8/debian/control +++ devil-1.7.8/debian/control @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: Bradley Smith -Build-Depends: debhelper (>= 7), libpng12-dev, zlib1g-dev, libjpeg-dev, libtiff4-dev, libmng-dev, liblcms1-dev, freeglut3-dev, libgl1-mesa-dev | libgl-dev, libsdl1.2-dev, liballegro4.2-dev, quilt +Build-Depends: debhelper (>= 7), libpng-dev (>= 1.5), zlib1g-dev, libjpeg-dev, libtiff4-dev, libmng-dev, liblcms1-dev, freeglut3-dev, libgl1-mesa-dev | libgl-dev, libsdl1.2-dev, liballegro4.2-dev, quilt Standards-Version: 3.8.3 Homepage: http://openil.sourceforge.net/ Vcs-Git: http://git.brad-smith.co.uk/git/debian/pkg-devil.git only in patch2: unchanged: --- devil-1.7.8.orig/src-IL/src/il_icon.c +++ devil-1.7.8/src-IL/src/il_icon.c @@ -525,7 +525,11 @@ // Expand low-bit-depth grayscale images to 8 bits if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { +#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 + png_set_expand_gray_1_2_4_to_8(ico_png_ptr); +#else png_set_gray_1_2_4_to_8(ico_png_ptr); +#endif } // Expand RGB images with transparency to full alpha channels only in patch2: unchanged: --- devil-1.7.8.orig/src-IL/src/il_png.c +++ devil-1.7.8/src-IL/src/il_png.c @@ -278,7 +278,11 @@ // Expand low-bit-depth grayscale images to 8 bits if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { +#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 + png_set_expand_gray_1_2_4_to_8(png_ptr); +#else png_set_gray_1_2_4_to_8(png_ptr); +#endif } // Expand RGB images with transparency to full alpha channels