debian/0000755000000000000000000000000011747447074007205 5ustar debian/xbubble-data.install0000644000000000000000000000002411354274532013112 0ustar usr/share/xbubble/* debian/menu0000644000000000000000000000014611354274532010064 0ustar ?package(xbubble):needs="X11" section="Games/Blocks" \ title="XBubble" command="/usr/games/xbubble" debian/docs0000644000000000000000000000005111354274532010043 0ustar AUTHORS NEWS README TODO NetworkProtocol debian/changelog0000644000000000000000000001263411747446052011060 0ustar xbubble (0.5.11.2-3.2) unstable; urgency=low * Non-maintainer upload. * Fixes FTBFS: loadpng.c ignoring return value of fread (Closes: #664910). -- Thomas Goirand Mon, 30 Apr 2012 08:23:12 +0000 xbubble (0.5.11.2-3.1) unstable; urgency=low [Jari Aalto] * Non-maintainer upload. - Move to packaging format "3.0 (quilt)" due to patch. * debian/patches - (Number 10): Add patch to fix Gcc 4.4 error: declaration of 'round' shadows a global declaration. Patch thanks to Ilya Barygin . (RC bug FTBFS serious; Closes: #552885). * debian/source/format - New file. -- Jari Aalto Tue, 30 Mar 2010 16:41:03 +0300 xbubble (0.5.11.2-3) unstable; urgency=low * Check return value of more functions (Closes: #511922). Thanks James Westby for the patch. * Add missing 'Depends: ${misc:Depends}' (lintian). -- Uwe Hermann Tue, 10 Mar 2009 02:20:39 +0100 xbubble (0.5.11.2-2) unstable; urgency=low * Standards-Version: 3.8.0 + debian/menu: Move to new section "Games/Blocks". + debian/control: Add Homepage field. * Drop obsolete 'x-dev' build-dependency. * debian/copyright: Switch to machine-readable format. * debian/watch: Add file. * debian/rules: Add 'LDFLAGS = -Wl,--as-needed' to prevent linking against unneeded libs. -- Uwe Hermann Sat, 27 Sep 2008 23:09:51 +0200 xbubble (0.5.11.2-1) unstable; urgency=low * New upstream release (Closes: #365147). * Switched to debhelper 5 (+ cdbs). * Standards-Version: 3.7.2 (no changes). * Mention the license (LGPL) of src/gettext.h in debian/copyright. -- Uwe Hermann Tue, 30 May 2006 18:23:57 +0200 xbubble (0.5.11.1-1) unstable; urgency=low * New upstream release (Closes: #358240). This fixes a GCC 4.1 problem. Thanks Martin Michlmayr and Martin Quinson. * debian/copyright: Be more verbose. Mark my own packaging as public domain. -- Uwe Hermann Wed, 5 Apr 2006 01:14:19 +0200 xbubble (0.5.11-1) unstable; urgency=low * New upstream release (Closes: #346275). * Standards-Version: 3.6.2.0 (no changes). * Updated debian/copyright. * Replace "xlibs-dev" Build-Depends with "libx11-dev, x-dev, libxt-dev". Thanks to Martin Quinson for the help! (Closes: #346764). -- Uwe Hermann Sat, 14 Jan 2006 21:37:54 +0100 xbubble (0.5.10-2) unstable; urgency=low * Fixed debian/copyright. * Build-Depend on libpng-dev now (transition to libpng 1.2, as libpng 1.0 will be removed from the archive). -- Uwe Hermann Mon, 13 Jun 2005 17:57:34 +0200 xbubble (0.5.10-1) unstable; urgency=low * New upstream release (Closes: #257080). * Updated download location of the tarball. * Build-Depend on libpng2-dev instead of libpng3-dev for now. * Added quotes around menu entries. -- Uwe Hermann Sat, 7 Aug 2004 12:29:06 +0200 xbubble (0.5.8-1) unstable; urgency=low * The "Thanks for your patience" release. * New upstream release (Closes: #199441). * Split the package into xbubble and xbubble-data. * Standards-Version: 3.6.1.0 (no changes). * debian/docs: Added TODO and NetworkProtocol. * debian/copyright: Updated URL to upstream download location. * Switched to cdbs. * Build-Depend on debhelper (>= 4.1.46) and autotools-dev, which is required by cdbs. * Acknowledge NMU. Upstream now included the patch from Goswin Brederlow. Thanks Goswin and Joachim! (Closes: #189971). -- Uwe Hermann Sun, 7 Dec 2003 16:07:04 +0100 xbubble (0.2.5-1.1) unstable; urgency=low * Non-maintainer upload at BSP at DebCamp * Apply patch to make it find the X11 libs (from Goswin Brederlow) (closes #189971) -- Joachim Breitner Thu, 17 Jul 2003 14:13:46 +0200 xbubble (0.2.5-1) unstable; urgency=low * New upstream release (Closes: #188430). * Standards-Version: 3.5.9.0 (no changes). * Use debhelper v4. * Updated debian/copyright. * Added some fixes from CVS. * Added the src/gettext.h file from CVS. -- Uwe Hermann Tue, 15 Apr 2003 23:45:28 +0200 xbubble (0.2-1) unstable; urgency=low * New upstream release. * Acknowledge NMU. Thanks Goswin and Thorsten! (Closes: #147507). * Standards-Version: 3.5.7.0 + Always provide debugging symbols. + Added support for noopt option. * Added NEWS to debian/docs. * Removed some Debian changes from the diff, because those changes have been merged upstream. * Fix cut'n'paste error in debian/copyright. -- Uwe Hermann Thu, 5 Sep 2002 03:23:32 +0200 xbubble (0.1.1-2.1) unstable; urgency=low * Non maintainer upload during bug squashing party. * Apply the patch from Goswin Brederlow. Changes: + Build against libpng3. + Pass -mieee to the compiler on alpha to fix the arithmetic exceptions on that architecture (Closes: #147507). -- Torsten Landschoff Sat, 31 Aug 2002 20:32:58 +0200 xbubble (0.1.1-2) unstable; urgency=low * Applied a small patch from Lukas Geyer , which fixes a problem with unsigned chars (Closes: #151291). Thanks Lukas! -- Uwe Hermann Fri, 28 Jun 2002 20:45:38 +0200 xbubble (0.1.1-1) unstable; urgency=low * Initial Release (Closes: #139077). * Several manpage fixes. -- Uwe Hermann Wed, 20 Mar 2002 14:28:27 +0100 debian/xbubble.install0000644000000000000000000000006511354274532012210 0ustar usr/games/xbubble usr/share/man/* usr/share/locale/* debian/patches/0000755000000000000000000000000011747447202010625 5ustar debian/patches/Fixes-FTBFS-with-loadpng.c-ignoring-return-value-of-fread0000644000000000000000000000157711747446146023246 0ustar Description: Fixes FTBFS ignoring return value of fread Author: Thomas Goirand Bug-Debian: http://bugs.debian.org/664910 Forwarded: no --- xbubble-0.5.11.2.orig/src/loadpng.c +++ xbubble-0.5.11.2/src/loadpng.c @@ -48,6 +48,7 @@ unsigned char * load_png_file( const cha png_structp png_ptr; png_infop info_ptr; png_bytep *row_pointers; + size_t result; fd = fopen( file, "rb" ); if ( fd == NULL ) { @@ -55,7 +56,12 @@ unsigned char * load_png_file( const cha return NULL; } /* ensure that we opened a PNG file */ - fread( header, 1, 8, fd ); + result = fread( header, 1, 8, fd ); + if (result != 8){ + fclose(fd); + fprintf(stderr,_("Error while reading file %s.\n"), file); + return NULL; + } if ( ! png_check_sig( header, 8 ) ) { fclose(fd); fprintf(stderr,_("File %s does not have a valid PNG signature.\n"), file); debian/patches/series0000644000000000000000000000021111747447126012041 0ustar 10-game.c.patch Fixes-FTBFS-with-loadpng.c-ignoring-return-value-of-fread Check-returns-from-the-realpath-function-in-data_file-function debian/patches/Check-returns-from-the-realpath-function-in-data_file-function0000644000000000000000000000116311747447202024563 0ustar Description: Checks the return value of realpath() call in data_file() This avoids a FTBFS Author: Thomas Goirand Bug-Debian: http://bugs.debian.org/664910 Forwarded: no --- xbubble-0.5.11.2.orig/src/init.c +++ xbubble-0.5.11.2/src/init.c @@ -97,7 +97,9 @@ static char * data_file( const char * fi path_max = 4096; #endif abs_data_dir = (char *) xmalloc( path_max * sizeof(char)); - realpath( data_dir, abs_data_dir ); + if(NULL == realpath( data_dir, abs_data_dir )){ + return NULL; + } offset = strlen(abs_data_dir); if ( offset > 1024-128 ) offset = 1024-128; debian/patches/10-game.c.patch0000644000000000000000000000407111354376723013223 0ustar From 33e5508f710b2d78674461fed16befde0f6f6c8f Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Tue, 30 Mar 2010 16:33:44 +0300 Subject: [PATCH] Fix error: declaration of 'round' shadows a global declaration Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto --- src/game.c | 4 ++-- src/xbubble.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/game.c b/src/game.c index cabd993..31e1342 100644 --- a/src/game.c +++ b/src/game.c @@ -187,7 +187,7 @@ static void display_cups( Game game, int n, int on ) { Game new_game( enum GameMode mode, RuleSet_t *ruleset, int *colors, - int round, + int round_now, int *score, enum Level level ) { @@ -200,7 +200,7 @@ Game new_game( enum GameMode mode, game->state = PLAYING; game->mode = mode; game->score = score; - game->round = round; + game->round = round_now; for ( i = 0; i < 2; i++ ) { game->player_left[i] = 0; game->player_right[i] = 0; diff --git a/src/xbubble.c b/src/xbubble.c index 8763c05..0f84d25 100644 --- a/src/xbubble.c +++ b/src/xbubble.c @@ -116,7 +116,7 @@ static void play_challenge_game( int *handicap ) { } static void play_match( enum GameMode mode, int *handicap, enum Level level ) { - int round; + int game_round; int done; int score[2]; int games[2] = { 0, 0 }; @@ -132,10 +132,10 @@ static void play_match( enum GameMode mode, int *handicap, enum Level level ) { score[0] = 0; score[1] = 0; done = 0; - for ( round = 1; !done; round++ ) { + for ( game_round = 1; !done; game_round++ ) { /* preload bubbles */ create_randome_level(5); - game = new_game( mode, ruleset, colors, round, score, level); + game = new_game( mode, ruleset, colors, game_round, score, level); result = play_game(game); done = score[1]==2 || score[0]==2 || result == ABORTED; //not_done= (!(((score[1]>=5)&&(score[1]-score[0]>1)) || -- 1.7.0 debian/rules0000755000000000000000000000103411354274532010252 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk # include /usr/share/cdbs/1/rules/simple-patchsys.mk # Fix build on alpha. ifneq (,$(findstring alpha,$(DEB_BUILD_GNU_TYPE))) CFLAGS += -mieee endif # Don't link against unneeded libs. LDFLAGS = -Wl,--as-needed # In multi-binary packages cdbs installs everything in debian/tmp. DEB_DH_INSTALL_SOURCEDIR := debian/tmp # Install the executable in the games directory. DEB_CONFIGURE_EXTRA_FLAGS := --bindir=\$${prefix}/games debian/copyright0000644000000000000000000000250411354274532011130 0ustar This package was debianized by Uwe Hermann on Tue, 19 Mar 2002 21:25:54 +0100. The current Debian maintainer is Uwe Hermann . It was downloaded from: http://alioth.debian.org/projects/xbubble/ Upstream Authors: Ivan Djelic Martin Quinson ------------------------------------------------------------------------------- Files: * Copyright: © 2002 Ivan Djelic License: GPL-2+ On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. ------------------------------------------------------------------------------- Files: src/board.c, src/cell.c, src/path_init.c, src/utils.c Copyright: © 2002 Ivan Djelic © 2003 Martin Quinson License: GPL-2+ ------------------------------------------------------------------------------- Files: src/gettext.h Copyright: © 1995-1998, 2000-2002 Free Software Foundation, Inc. License: GPL-2+ ------------------------------------------------------------------------------- Files: debian/* Copyright: © 2002 - 2008 Uwe Hermann License: PD The packaging done by Uwe Hermann is hereby released as public domain. debian/watch0000644000000000000000000000012011354274532010216 0ustar version=3 http://alioth.debian.org/frs/?group_id=30479 .*/xbubble-(.*)\.tar\.gz debian/control0000644000000000000000000000306011354274532010576 0ustar Source: xbubble Section: games Priority: optional Maintainer: Uwe Hermann Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libpng-dev, libx11-dev, libxt-dev Standards-Version: 3.8.0 Homepage: http://alioth.debian.org/projects/xbubble/ Package: xbubble Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, xbubble-data (>= 0.5.11.2-1) Description: A nice Puzzle Bubble clone XBubble is a Puzzle Bubble / Bust-A-Move clone. . Your goal is to remove all the bubbles from the game board. To do this you must aim and shoot bubbles. When you manage to match 3 or more bubbles of the same color, they burst and disappear. All bubbles which hang free now, will fall down and disappear, too. . XBubble features single player mode, two player mode and player vs. computer (five difficulty levels of the AI) and has nice graphics, but no sound. Package: xbubble-data Architecture: all Depends: ${misc:Depends} Recommends: xbubble Conflicts: xbubble (<< 0.5.8-1) Description: Data files for XBubble, a nice Puzzle Bubble clone This package contains the data files for XBubble. . XBubble is a Puzzle Bubble / Bust-A-Move clone. . Your goal is to remove all the bubbles from the game board. To do this you must aim and shoot bubbles. When you manage to match 3 or more bubbles of the same color, they burst and disappear. All bubbles which hang free now, will fall down and disappear, too. . XBubble features single player mode, two player mode and player vs. computer (five difficulty levels of the AI) and has nice graphics, but no sound. debian/source/0000755000000000000000000000000011354376717010504 5ustar debian/source/format0000644000000000000000000000001411363001510011662 0ustar 3.0 (quilt) debian/compat0000644000000000000000000000000211354274532010372 0ustar 5