diff -Nru freegish-1.53+git20101011+dfsg/debian/changelog freegish-1.53+git20101011+dfsg/debian/changelog --- freegish-1.53+git20101011+dfsg/debian/changelog 2011-04-01 11:55:48.000000000 +0000 +++ freegish-1.53+git20101011+dfsg/debian/changelog 2012-06-01 07:38:40.000000000 +0000 @@ -1,3 +1,15 @@ +freegish (1.53+git20101011+dfsg-2) unstable; urgency=low + + * Change build-depends on libpng12-dev to libpng-dev. (Closes: #662335) + * Fix FTBFS with libpng 1.5. (Closes: #649796) + * Fix FTBFS on kFreeBSD and Hurd. + * Changed description string to make lintian happy. + * Added Recommends freegish to freegish-data. + * Bump Standards Version to 3.9.3. (No changes needed). + * Update debhelper compatiblity level from 8 to 9. + + -- Luboš Novák Fri, 1 Jun 2012 09:29:40 +0100 + freegish (1.53+git20101011+dfsg-1) unstable; urgency=low * Initial release. (Closes: #619105) diff -Nru freegish-1.53+git20101011+dfsg/debian/compat freegish-1.53+git20101011+dfsg/debian/compat --- freegish-1.53+git20101011+dfsg/debian/compat 2011-03-17 08:57:18.000000000 +0000 +++ freegish-1.53+git20101011+dfsg/debian/compat 2012-06-01 07:22:03.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru freegish-1.53+git20101011+dfsg/debian/control freegish-1.53+git20101011+dfsg/debian/control --- freegish-1.53+git20101011+dfsg/debian/control 2011-03-17 08:57:30.000000000 +0000 +++ freegish-1.53+git20101011+dfsg/debian/control 2012-06-01 07:35:40.000000000 +0000 @@ -3,17 +3,17 @@ Priority: optional Maintainer: Debian Games Team Uploaders: Luboš Novák -Build-Depends: debhelper (>= 8), cmake (>= 2.4.4), quilt (>= 0.46-7~), - libsdl1.2-dev, libopenal-dev, libvorbis-dev, libogg-dev, libpng12-dev -Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 9), cmake (>= 2.4.4), quilt (>= 0.46-7~), + libsdl1.2-dev, libopenal-dev, libvorbis-dev, libogg-dev, libpng-dev +Standards-Version: 3.9.3 Homepage: https://www.github.com/megagun/gish Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freegish/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/freegish/?op=log +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/freegish/ Package: freegish Architecture: any Depends: xdg-utils, freegish-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: a physics based arcade game +Description: physics based arcade game Freegish is a 2D platform game, where the player maneuvers character of a ball of tar. Character may become sticky, slick, heavy and can jump. . @@ -43,6 +43,7 @@ Package: freegish-data Architecture: all Depends: ${misc:Depends} +Recommends: freegish Description: data for the FreeGish arcade game Freegish is a 2D platform game, where the player maneuvers character of a ball of tar. Character may become sticky, slick, heavy and can jump. diff -Nru freegish-1.53+git20101011+dfsg/debian/patches/fix_for_png15.patch freegish-1.53+git20101011+dfsg/debian/patches/fix_for_png15.patch --- freegish-1.53+git20101011+dfsg/debian/patches/fix_for_png15.patch 1970-01-01 00:00:00.000000000 +0000 +++ freegish-1.53+git20101011+dfsg/debian/patches/fix_for_png15.patch 2012-05-31 11:43:35.000000000 +0000 @@ -0,0 +1,50 @@ +fix FTBFS for libpng 1.5 +Index: freegish-1.53+git20101011+dfsg/video/texture.c +=================================================================== +--- freegish-1.53+git20101011+dfsg.orig/video/texture.c 2011-11-26 18:10:31.000000000 +0100 ++++ freegish-1.53+git20101011+dfsg/video/texture.c 2011-11-26 18:11:43.000000000 +0100 +@@ -89,27 +89,27 @@ + png_read_info(png_ptr, info_ptr); + + /* expand paletted colors into true rgb */ +- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) + png_set_expand(png_ptr); + + /* expand grayscale images to the full 8 bits */ +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY && info_ptr->bit_depth < 8) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY && png_get_bit_depth(png_ptr, info_ptr) < 8) + png_set_expand(png_ptr); + + /* expand images with transparency to full alpha channels */ +- if (info_ptr->valid & PNG_INFO_tRNS) ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) + png_set_expand(png_ptr); + + /* tell libpng to strip 16 bit depth files down to 8 bits */ +- if (info_ptr->bit_depth == 16) ++ if (png_get_bit_depth(png_ptr, info_ptr) == 16) + png_set_strip_16(png_ptr); + + /* fill upto 4 byte RGBA - we always want an alpha channel*/ +- if (info_ptr->bit_depth == 8 && info_ptr->color_type != PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_bit_depth(png_ptr, info_ptr) == 8 && png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_RGB_ALPHA) + png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER); + + // XXX: is this required? we're not handling interlaced PNGs ... +- if (info_ptr->interlace_type) ++ if (png_get_interlace_type(png_ptr, info_ptr)) + number_passes = png_set_interlace_handling(png_ptr); + else + number_passes = 1; +@@ -125,8 +125,8 @@ + else + { + int w, h, y; +- w = info_ptr->width; +- h = info_ptr->height; ++ w = png_get_image_width(png_ptr, info_ptr); ++ h = png_get_image_height(png_ptr, info_ptr); + *width = w; + *height = h; + *rgba = (unsigned int *) malloc(w*h*4); diff -Nru freegish-1.53+git20101011+dfsg/debian/patches/ftbfs_freebsd_hurd.patch freegish-1.53+git20101011+dfsg/debian/patches/ftbfs_freebsd_hurd.patch --- freegish-1.53+git20101011+dfsg/debian/patches/ftbfs_freebsd_hurd.patch 1970-01-01 00:00:00.000000000 +0000 +++ freegish-1.53+git20101011+dfsg/debian/patches/ftbfs_freebsd_hurd.patch 2012-05-31 11:43:35.000000000 +0000 @@ -0,0 +1,36 @@ +fix FTBFS for kFreeBSD and Hurd +Index: freegish-1.53+git20101011+dfsg/game/socket.c +=================================================================== +--- freegish-1.53+git20101011+dfsg.orig/game/socket.c 2011-04-01 12:56:46.000000000 +0200 ++++ freegish-1.53+git20101011+dfsg/game/socket.c 2011-11-28 13:11:55.336458392 +0100 +@@ -25,7 +25,7 @@ + #include + #include + #endif +-#ifdef LINUX ++#if defined(LINUX) || defined(__FreeBSD_kernel__) || defined(__GNU__) + #include + #include + #include +@@ -75,7 +75,7 @@ + ICStop(inst); + */ + #endif +-#ifdef LINUX ++#if defined(LINUX) || defined(__FreeBSD_kernel__) || defined(__GNU__) + char command[100] = "xdg-open http://"; + strcat(command, webpagename); + SDL_WM_IconifyWindow(); +Index: freegish-1.53+git20101011+dfsg/video/opengl.h +=================================================================== +--- freegish-1.53+git20101011+dfsg.orig/video/opengl.h 2011-04-01 12:56:47.000000000 +0200 ++++ freegish-1.53+git20101011+dfsg/video/opengl.h 2011-11-28 13:12:15.397408664 +0100 +@@ -37,7 +37,7 @@ + #include "../video/glext.h" + #endif + +-#ifdef LINUX ++#if defined(LINUX) || defined(__FreeBSD_kernel__) || defined(__GNU__) + #include + #include + #endif diff -Nru freegish-1.53+git20101011+dfsg/debian/patches/series freegish-1.53+git20101011+dfsg/debian/patches/series --- freegish-1.53+git20101011+dfsg/debian/patches/series 2011-01-10 21:37:48.000000000 +0000 +++ freegish-1.53+git20101011+dfsg/debian/patches/series 2012-05-31 11:43:35.000000000 +0000 @@ -2,3 +2,5 @@ fix_title_and_icon_text.patch rename_config_dir.patch custom_level_loading.patch +ftbfs_freebsd_hurd.patch +fix_for_png15.patch