tags 662382 + patch tags 662382 + pending tags 667216 + pending thanks Dear maintainer,
I've prepared an NMU for jigzo (versioned as 0.6.1-5.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Rolling Stones: Someone
diff -Nru jigzo-0.6.1/debian/changelog jigzo-0.6.1/debian/changelog --- jigzo-0.6.1/debian/changelog 2011-07-27 18:20:30.000000000 +0200 +++ jigzo-0.6.1/debian/changelog 2012-04-22 15:48:16.000000000 +0200 @@ -1,3 +1,16 @@ +jigzo (0.6.1-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "ftbfs with GCC-4.7": add patch 05_gcc_4_7.patch from Paul Tagliamonte + (#include unistd.h). + Closes: #667216 + * Fix "Please Build-Depends on libpng-dev, change from libpng12-dev": + do as the bug report requests, and add patch 06_libpng_1_5.patch, taken + from FreeBSD. + Closes: #662382 + + -- gregor herrmann <[email protected]> Sun, 22 Apr 2012 15:47:48 +0200 + jigzo (0.6.1-5) unstable; urgency=low * Bump Standards-Version to 3.9.2. diff -Nru jigzo-0.6.1/debian/control jigzo-0.6.1/debian/control --- jigzo-0.6.1/debian/control 2011-07-22 01:15:07.000000000 +0200 +++ jigzo-0.6.1/debian/control 2012-04-22 15:29:56.000000000 +0200 @@ -2,7 +2,7 @@ Section: games Priority: optional Maintainer: Elías Alejandro Año Mendoza <[email protected]> -Build-Depends: debhelper (>= 8.0.0), libjpeg-dev, libpng12-dev, libsdl1.2-dev, libsdl-mixer1.2-dev +Build-Depends: debhelper (>= 8.0.0), libjpeg-dev, libpng-dev, libsdl1.2-dev, libsdl-mixer1.2-dev Standards-Version: 3.9.2 Homepage: http://www.resorama.com/jigzo/ diff -Nru jigzo-0.6.1/debian/patches/05_gcc_4_7.patch jigzo-0.6.1/debian/patches/05_gcc_4_7.patch --- jigzo-0.6.1/debian/patches/05_gcc_4_7.patch 1970-01-01 01:00:00.000000000 +0100 +++ jigzo-0.6.1/debian/patches/05_gcc_4_7.patch 2012-04-22 15:25:10.000000000 +0200 @@ -0,0 +1,15 @@ +Description: add missing include + FTBFS with gcc 4.7 +Author: Paul Tagliamonte <[email protected]> +Bugs-Debian: http://bugs.debian.org/667216 + +--- a/src/main.cxx 2012-04-20 22:40:17.531649262 -0400 ++++ b/src/main.cxx 2012-04-20 22:40:21.591649045 -0400 +@@ -60,6 +60,7 @@ bool soundFailed = false; + #include <fstream> + #include <string> + #include <sstream> ++#include <unistd.h> + #include <algorithm> + + #ifdef WIN32 diff -Nru jigzo-0.6.1/debian/patches/06_libpng_1_5.patch jigzo-0.6.1/debian/patches/06_libpng_1_5.patch --- jigzo-0.6.1/debian/patches/06_libpng_1_5.patch 1970-01-01 01:00:00.000000000 +0100 +++ jigzo-0.6.1/debian/patches/06_libpng_1_5.patch 2012-04-22 15:47:13.000000000 +0200 @@ -0,0 +1,16 @@ +Description: fix build failure with libpng 1.5 +Origin: http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/ports/games/jigzo/Makefile?rev=1.25;content-type=text%2Fplain +Reviewed-by: gregor herrmann <[email protected]> +Last-Update: 2012-04-22 + +--- a/src/Loader.cxx ++++ b/src/Loader.cxx +@@ -195,7 +195,7 @@ + int bit_depth, color_type, interlace_type; + png_read_info(png_ptr, info_ptr); + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, +- &color_type, &interlace_type, int_p_NULL, int_p_NULL); ++ &color_type, &interlace_type, NULL, NULL); + + int row_bytes = png_get_rowbytes(png_ptr, info_ptr); + diff -Nru jigzo-0.6.1/debian/patches/series jigzo-0.6.1/debian/patches/series --- jigzo-0.6.1/debian/patches/series 2011-07-20 00:02:58.000000000 +0200 +++ jigzo-0.6.1/debian/patches/series 2012-04-22 15:47:37.000000000 +0200 @@ -1,3 +1,5 @@ 01_paths.patch 03_gcc_4_3.patch 04_any_resolution.patch +05_gcc_4_7.patch +06_libpng_1_5.patch
signature.asc
Description: Digital signature
