Author: pabs Date: 2011-03-24 14:16:05 +0000 (Thu, 24 Mar 2011) New Revision: 12010
Added: packages/tags/barrage/1.0.3-1/ packages/tags/barrage/1.0.3-1/debian/barrage.6 packages/tags/barrage/1.0.3-1/debian/changelog packages/tags/barrage/1.0.3-1/debian/control packages/tags/barrage/1.0.3-1/debian/copyright packages/tags/barrage/1.0.3-1/debian/install packages/tags/barrage/1.0.3-1/debian/menu packages/tags/barrage/1.0.3-1/debian/patches/01_getopt.diff packages/tags/barrage/1.0.3-1/debian/patches/02_nosound.diff packages/tags/barrage/1.0.3-1/debian/patches/fix-FTBFS-with-GCC-4.5.patch packages/tags/barrage/1.0.3-1/debian/patches/fix_sprintf packages/tags/barrage/1.0.3-1/debian/rules Removed: packages/tags/barrage/1.0.3-1/debian/barrage.6 packages/tags/barrage/1.0.3-1/debian/changelog packages/tags/barrage/1.0.3-1/debian/control packages/tags/barrage/1.0.3-1/debian/copyright packages/tags/barrage/1.0.3-1/debian/dirs packages/tags/barrage/1.0.3-1/debian/menu packages/tags/barrage/1.0.3-1/debian/patches/01_getopt.diff packages/tags/barrage/1.0.3-1/debian/patches/02_nosound.diff packages/tags/barrage/1.0.3-1/debian/patches/fix-FTBFS-with-GCC-4.5.patch packages/tags/barrage/1.0.3-1/debian/patches/fix_sprintf packages/tags/barrage/1.0.3-1/debian/rules Log: [svn-buildpackage] Tagging barrage 1.0.3-1 Deleted: packages/tags/barrage/1.0.3-1/debian/barrage.6 =================================================================== --- packages/trunk/barrage/debian/barrage.6 2011-03-24 10:16:24 UTC (rev 11995) +++ packages/tags/barrage/1.0.3-1/debian/barrage.6 2011-03-24 14:16:05 UTC (rev 12010) @@ -1,30 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH BARRAGE 6 "maj 31, 2004" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -barrage \- action game -.SH SYNOPSIS -.B barrage -.SH DESCRIPTION -Barrage is a rather violent action game with the objective to kill -and destroy as many targets as possible within 3 minutes. The player -controls a gun that may either fire small or large grenades at -soldiers, jeeps and tanks. It is a very simple gameplay though it is -not that easy to get high scores. -.SH AUTHOR -This manual page was written by Rafal Zawadzki <[email protected]>, -for the Debian project (but may be used by others). Copied: packages/tags/barrage/1.0.3-1/debian/barrage.6 (from rev 12004, packages/trunk/barrage/debian/barrage.6) =================================================================== --- packages/tags/barrage/1.0.3-1/debian/barrage.6 (rev 0) +++ packages/tags/barrage/1.0.3-1/debian/barrage.6 2011-03-24 14:16:05 UTC (rev 12010) @@ -0,0 +1,15 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH BARRAGE 6 "May 31, 2004" +.SH NAME +barrage \- rather destructive action game +.SH SYNOPSIS +.B barrage +.SH DESCRIPTION +Barrage is a rather destructive action game that puts you on a shooting +range with the objective to hit as many dummy targets as possible +within 3 minutes. You control a gun which may either fire small or large +grenades at dummy soldiers, jeeps and tanks. The gameplay is simple but +it is not that easy to get high scores. +.SH AUTHOR +This manual page was written by Rafal Zawadzki <[email protected]>, +for the Debian project (but may be used by others). Deleted: packages/tags/barrage/1.0.3-1/debian/changelog =================================================================== --- packages/trunk/barrage/debian/changelog 2011-03-24 10:16:24 UTC (rev 11995) +++ packages/tags/barrage/1.0.3-1/debian/changelog 2011-03-24 14:16:05 UTC (rev 12010) @@ -1,99 +0,0 @@ -barrage (1.0.3-1) UNRELEASED; urgency=low - - [ Gonéri Le Bouder ] - * new upstream release - * add a BD on autotools-dev to get fresh config.{sub,guess} - * bump Standards-Version to 3.9.1, no changes - * barrage depends on ${misc:Depends} now - - [ Paul Wise ] - * Switch to dpkg-source v3 quilt - * Wrap build-deps one per line - * Drop build-dep on pre-etch binutils - * Clean up the watch file - * Fix games team URL in copyright file - * Wrap the menu file one attribute per line - * Refresh patches - * Add patch from Ubuntu to allow building with newer GCC (Closes: #553932) - - -- Gonéri Le Bouder <[email protected]> Mon, 03 Jan 2011 22:09:01 +0100 - -barrage (1.0.2-4) unstable; urgency=low - - * adjust fix_sprintf to avoid a FTBFS - * Standard version 3.8.0, no change - - -- Gonéri Le Bouder <[email protected]> Sat, 14 Feb 2009 15:15:26 +0100 - -barrage (1.0.2-3) experimental; urgency=low - - * fix an invalid call of sprintf fix_sprintf() - http://lists.debian.org/debian-devel/2008/12/msg01079.html - - -- Gonéri Le Bouder <[email protected]> Sat, 03 Jan 2009 17:26:24 +0100 - -barrage (1.0.2-2) unstable; urgency=low - - [ Gonéri Le Bouder ] - * copright file: - - update Debian Games Team home URL - - change name from pkg-games to Debian Games Team - - add the year 2003 in the copyright line - * if nostrip is set in DEB_BUILD_OPTIONS it's useless to do: - INSTALL_PROGRAM += -s since dh_strip already do the job - * adds build depends on binutils (>= 2.14.90.0.7), according to dh_strip - manpage - - [ Eddy Petrișor ] - * Fix Homepage semi URL - - [ Jon Dowland ] - * update menu section to "Games/Action" for menu transition - (thanks Linas Žvirblis) - - [ Cyril Brulebois ] - * Added Vcs-Svn and Vcs-Browser fields in the control file. - - [ Barry deFreese ] - * Fix make clean lintian warning. - * Bump to Standards Version 3.7.3. - + Menu policy transition. - * Add quilt patch system. - * 01_getopt.diff - (Closes: #472315). - + Return int from getopt, not char. - * 02_nosound.diff - (Closes: #449328). - + If no sound card, disable sound and continue. - * Add myself to uploaders. - * Remove Homepage from package description. - - [ Jon Dowland ] - * add Homepage: control field to source stanza - - -- Barry deFreese <[email protected]> Sun, 30 Mar 2008 01:15:36 -0400 - -barrage (1.0.2-1) unstable; urgency=low - - [ Gonéri Le Bouder ] - * change dephelper to >= 5.0.0 and standards-version to 3.6.2 - * update of debian/copyright - * New maintaineur: Debian Games Team (Closes: #352439) - * new icon (Closes: #259027) Thanks Dan Korostelev <[email protected]> - * watch file - * new upstream release - - -- Gonéri Le Bouder <[email protected]> Mon, 13 Mar 2006 16:25:03 +0100 - -barrage (1.0.1-2) unstable; urgency=low - - * QA Group upload orphaning this package - - -- Andrew Pollock <[email protected]> Fri, 10 Mar 2006 23:35:50 -0800 - -barrage (1.0.1-1) unstable; urgency=low - - * Closes: #249745: Acknowledgement (ITP: barrage -- Rather violent action - game) - * Initial Release. - - -- Rafal Zawadzki <[email protected]> Mon, 31 May 2004 09:39:04 +0200 - Copied: packages/tags/barrage/1.0.3-1/debian/changelog (from rev 12009, packages/trunk/barrage/debian/changelog) =================================================================== --- packages/tags/barrage/1.0.3-1/debian/changelog (rev 0) +++ packages/tags/barrage/1.0.3-1/debian/changelog 2011-03-24 14:16:05 UTC (rev 12010) @@ -0,0 +1,108 @@ +barrage (1.0.3-1) unstable; urgency=low + + * Team upload. + + [ Gonéri Le Bouder ] + * new upstream release + * add a BD on autotools-dev to get fresh config.{sub,guess} + * bump Standards-Version to 3.9.1, no changes + * barrage depends on ${misc:Depends} now + + [ Paul Wise ] + * Switch to dpkg-source v3 quilt + * Wrap build-deps one per line + * Drop build-dep on pre-etch binutils + * Clean up the watch file + * Fix games team URL in copyright file + * Wrap the menu file one attribute per line + * Refresh patches + * Add patch from Ubuntu to allow building with newer GCC (Closes: #553932) + - Use dh-autoreconf to rebuild the build system + * Drop non-useful comments from the manual page + * Correct month in the manual page + * Lengthen the short description in the manual page + * Bump upstream copyright years + * Switch to upstream's new wording for the game description + * Forward patches upstream and add DEP-3 headers to them + + -- Paul Wise <[email protected]> Thu, 24 Mar 2011 22:11:56 +0800 + +barrage (1.0.2-4) unstable; urgency=low + + * adjust fix_sprintf to avoid a FTBFS + * Standard version 3.8.0, no change + + -- Gonéri Le Bouder <[email protected]> Sat, 14 Feb 2009 15:15:26 +0100 + +barrage (1.0.2-3) experimental; urgency=low + + * fix an invalid call of sprintf fix_sprintf() + http://lists.debian.org/debian-devel/2008/12/msg01079.html + + -- Gonéri Le Bouder <[email protected]> Sat, 03 Jan 2009 17:26:24 +0100 + +barrage (1.0.2-2) unstable; urgency=low + + [ Gonéri Le Bouder ] + * copright file: + - update Debian Games Team home URL + - change name from pkg-games to Debian Games Team + - add the year 2003 in the copyright line + * if nostrip is set in DEB_BUILD_OPTIONS it's useless to do: + INSTALL_PROGRAM += -s since dh_strip already do the job + * adds build depends on binutils (>= 2.14.90.0.7), according to dh_strip + manpage + + [ Eddy Petrișor ] + * Fix Homepage semi URL + + [ Jon Dowland ] + * update menu section to "Games/Action" for menu transition + (thanks Linas Žvirblis) + + [ Cyril Brulebois ] + * Added Vcs-Svn and Vcs-Browser fields in the control file. + + [ Barry deFreese ] + * Fix make clean lintian warning. + * Bump to Standards Version 3.7.3. + + Menu policy transition. + * Add quilt patch system. + * 01_getopt.diff - (Closes: #472315). + + Return int from getopt, not char. + * 02_nosound.diff - (Closes: #449328). + + If no sound card, disable sound and continue. + * Add myself to uploaders. + * Remove Homepage from package description. + + [ Jon Dowland ] + * add Homepage: control field to source stanza + + -- Barry deFreese <[email protected]> Sun, 30 Mar 2008 01:15:36 -0400 + +barrage (1.0.2-1) unstable; urgency=low + + [ Gonéri Le Bouder ] + * change dephelper to >= 5.0.0 and standards-version to 3.6.2 + * update of debian/copyright + * New maintaineur: Debian Games Team (Closes: #352439) + * new icon (Closes: #259027) Thanks Dan Korostelev <[email protected]> + * watch file + * new upstream release + + -- Gonéri Le Bouder <[email protected]> Mon, 13 Mar 2006 16:25:03 +0100 + +barrage (1.0.1-2) unstable; urgency=low + + * QA Group upload orphaning this package + + -- Andrew Pollock <[email protected]> Fri, 10 Mar 2006 23:35:50 -0800 + +barrage (1.0.1-1) unstable; urgency=low + + * Closes: #249745: Acknowledgement (ITP: barrage -- Rather violent action + game) + * Initial Release. + + -- Rafal Zawadzki <[email protected]> Mon, 31 May 2004 09:39:04 +0200 + Deleted: packages/tags/barrage/1.0.3-1/debian/control =================================================================== --- packages/trunk/barrage/debian/control 2011-03-24 10:16:24 UTC (rev 11995) +++ packages/tags/barrage/1.0.3-1/debian/control 2011-03-24 14:16:05 UTC (rev 12010) @@ -1,23 +0,0 @@ -Source: barrage -Section: games -Priority: optional -Maintainer: Debian Games Team <[email protected]> -Uploaders: Barry deFreese <[email protected]>, Gonéri Le Bouder <[email protected]> -Build-Depends: debhelper (>= 7), - libsdl1.2-dev, - libsdl-mixer1.2-dev, - autotools-dev -Standards-Version: 3.9.1 -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/barrage/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/barrage/?op=log -Homepage: http://lgames.sourceforge.net/index.php?project=Barrage - -Package: barrage -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Rather violent action game - Barrage is a game with the objective to kill and destroy - as many targets as possible within 3 minutes. The player - controls a gun that may either fire small or large grenades - at soldiers, jeeps and tanks. It is a very simple gameplay - though it is not that easy to get high scores. Copied: packages/tags/barrage/1.0.3-1/debian/control (from rev 12004, packages/trunk/barrage/debian/control) =================================================================== --- packages/tags/barrage/1.0.3-1/debian/control (rev 0) +++ packages/tags/barrage/1.0.3-1/debian/control 2011-03-24 14:16:05 UTC (rev 12010) @@ -0,0 +1,24 @@ +Source: barrage +Section: games +Priority: optional +Maintainer: Debian Games Team <[email protected]> +Uploaders: Barry deFreese <[email protected]>, Gonéri Le Bouder <[email protected]> +Build-Depends: debhelper (>= 7.0.50~), + dh-autoreconf, + libsdl1.2-dev, + libsdl-mixer1.2-dev, + autotools-dev +Standards-Version: 3.9.1 +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/barrage/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/barrage/?op=log +Homepage: http://lgames.sourceforge.net/index.php?project=Barrage + +Package: barrage +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Rather destructive action game + Barrage is a rather destructive action game that puts you on a shooting + range with the objective to hit as many dummy targets as possible + within 3 minutes. You control a gun which may either fire small or large + grenades at dummy soldiers, jeeps and tanks. The gameplay is simple but + it is not that easy to get high scores. Deleted: packages/tags/barrage/1.0.3-1/debian/copyright =================================================================== --- packages/trunk/barrage/debian/copyright 2011-03-24 10:16:24 UTC (rev 11995) +++ packages/tags/barrage/1.0.3-1/debian/copyright 2011-03-24 14:16:05 UTC (rev 12010) @@ -1,24 +0,0 @@ -This package was debianized by Rafal Zawadzki <[email protected]> on -Mon, 31 May 2004 09:39:04 +0200. - -The actual maintainer is the Debian Games Team: -http://wiki.debian.org/Games/Team - - -It was downloaded from http://lgames.sourceforge.net/index.php?project=Barrage - -Upstream Author: Michael Speck <[email protected]> - -Copyright: - -Copyright 2003 Michael Speck <[email protected]> - -License: - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -A full copy of the GPL can be found at /usr/share/common-licenses/ - Copied: packages/tags/barrage/1.0.3-1/debian/copyright (from rev 12003, packages/trunk/barrage/debian/copyright) =================================================================== --- packages/tags/barrage/1.0.3-1/debian/copyright (rev 0) +++ packages/tags/barrage/1.0.3-1/debian/copyright 2011-03-24 14:16:05 UTC (rev 12010) @@ -0,0 +1,24 @@ +This package was debianized by Rafal Zawadzki <[email protected]> on +Mon, 31 May 2004 09:39:04 +0200. + +The actual maintainer is the Debian Games Team: +http://wiki.debian.org/Games/Team + + +It was downloaded from http://lgames.sourceforge.net/index.php?project=Barrage + +Upstream Author: Michael Speck <[email protected]> + +Copyright: + +Copyright 2010 Michael Speck <[email protected]> + +License: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +A full copy of the GPL can be found at /usr/share/common-licenses/ + Deleted: packages/tags/barrage/1.0.3-1/debian/dirs =================================================================== --- packages/trunk/barrage/debian/dirs 2011-03-24 10:16:24 UTC (rev 11995) +++ packages/tags/barrage/1.0.3-1/debian/dirs 2011-03-24 14:16:05 UTC (rev 12010) @@ -1 +0,0 @@ -usr/games Copied: packages/tags/barrage/1.0.3-1/debian/install (from rev 12005, packages/trunk/barrage/debian/install) =================================================================== --- packages/tags/barrage/1.0.3-1/debian/install (rev 0) +++ packages/tags/barrage/1.0.3-1/debian/install 2011-03-24 14:16:05 UTC (rev 12010) @@ -0,0 +1 @@ +debian/barrage.xpm usr/share/pixmaps Deleted: packages/tags/barrage/1.0.3-1/debian/menu =================================================================== --- packages/trunk/barrage/debian/menu 2011-03-24 10:16:24 UTC (rev 11995) +++ packages/tags/barrage/1.0.3-1/debian/menu 2011-03-24 14:16:05 UTC (rev 12010) @@ -1,6 +0,0 @@ -?package(barrage):needs="X11" - section="Games/Action" \ - longtitle="Barrage - a rather violent action game" \ - title="Barrage" \ - command="/usr/games/barrage" \ - icon="/usr/share/pixmaps/barrage.xpm" Copied: packages/tags/barrage/1.0.3-1/debian/menu (from rev 12004, packages/trunk/barrage/debian/menu) =================================================================== --- packages/tags/barrage/1.0.3-1/debian/menu (rev 0) +++ packages/tags/barrage/1.0.3-1/debian/menu 2011-03-24 14:16:05 UTC (rev 12010) @@ -0,0 +1,6 @@ +?package(barrage):needs="X11" \ + section="Games/Action" \ + longtitle="Rather destructive action game" \ + title="Barrage" \ + command="/usr/games/barrage" \ + icon="/usr/share/pixmaps/barrage.xpm" Deleted: packages/tags/barrage/1.0.3-1/debian/patches/01_getopt.diff =================================================================== --- packages/trunk/barrage/debian/patches/01_getopt.diff 2011-03-24 10:16:24 UTC (rev 11995) +++ packages/tags/barrage/1.0.3-1/debian/patches/01_getopt.diff 2011-03-24 14:16:05 UTC (rev 12010) @@ -1,11 +0,0 @@ ---- a/src/main.c -+++ b/src/main.c -@@ -555,7 +555,7 @@ - - int main( int argc, char **argv ) - { -- char c; -+ int c; - - printf( "BARRAGE v%s\n", VERSION ); - printf( "Copyright 2003-2010 Michael Speck (http://lgames.sf.net)\n" ); Copied: packages/tags/barrage/1.0.3-1/debian/patches/01_getopt.diff (from rev 12007, packages/trunk/barrage/debian/patches/01_getopt.diff) =================================================================== --- packages/tags/barrage/1.0.3-1/debian/patches/01_getopt.diff (rev 0) +++ packages/tags/barrage/1.0.3-1/debian/patches/01_getopt.diff 2011-03-24 14:16:05 UTC (rev 12010) @@ -0,0 +1,15 @@ +Author: Barry deFreese <[email protected]> +Description: use an int instead of a char to avoid signedness portability issues +Bug: http://sf.net/support/tracker.php?aid=3240735 +Bug-Debian: http://bugs.debian.org/472315 +--- a/src/main.c ++++ b/src/main.c +@@ -555,7 +555,7 @@ + + int main( int argc, char **argv ) + { +- char c; ++ int c; + + printf( "BARRAGE v%s\n", VERSION ); + printf( "Copyright 2003-2010 Michael Speck (http://lgames.sf.net)\n" ); Deleted: packages/tags/barrage/1.0.3-1/debian/patches/02_nosound.diff =================================================================== --- packages/trunk/barrage/debian/patches/02_nosound.diff 2011-03-24 10:16:24 UTC (rev 11995) +++ packages/tags/barrage/1.0.3-1/debian/patches/02_nosound.diff 2011-03-24 14:16:05 UTC (rev 12010) @@ -1,72 +0,0 @@ ---- a/src/data.c -+++ b/src/data.c -@@ -51,6 +51,8 @@ - int cursor_w = 0, cursor_x_offset = 0; - int gun_w = 0, gun_h = 0; - -+extern int audio_on; -+ - extern SDL_Surface *screen; /* display */ - - #define SET_ALPHA( surf, alpha ) SDL_SetAlpha( surf, SDL_SRCALPHA | SDL_RLEACCEL, alpha ) -@@ -234,6 +236,7 @@ - ft_menu = ft_chart; ft_menu_highlight = ft_chart_highlight; - - #ifdef AUDIO_ENABLED -+ if ( audio_on ) { - wav_expl1 = data_load_sound( "expl1.wav" ); - wav_expl2 = data_load_sound( "expl2.wav" ); - wav_expl3 = data_load_sound( "expl3.wav" ); -@@ -241,6 +244,7 @@ - wav_cannon2 = data_load_sound( "gunfire.wav" ); - wav_click = data_load_sound( "click.wav" ); - wav_highlight = data_load_sound( "highlight.wav" ); -+ } - #endif - - cr_empty = data_create_cursor( 16, 16, 8, 8, -@@ -288,6 +292,7 @@ - printf( "%i fonts deleted\n", ft_count ); - - #ifdef AUDIO_ENABLED -+ if ( audio_on ) { - data_free_sound( &wav_expl1 ); - data_free_sound( &wav_expl2 ); - data_free_sound( &wav_expl3 ); -@@ -295,6 +300,7 @@ - data_free_sound( &wav_click ); - data_free_sound( &wav_highlight ); - printf( "%i sounds deleted\n", wav_count ); -+ } - #endif - - data_free_cursor( &cr_empty ); ---- a/src/main.c -+++ b/src/main.c -@@ -576,10 +576,15 @@ - - set_player_name_from_env(); - -- if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_AUDIO ) < 0 ) { -+ if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_TIMER ) < 0 ) { - printf( "%s\n", SDL_GetError() ); - exit(1); - } -+ else if ( SDL_InitSubSystem( SDL_INIT_AUDIO ) < 0 ) { -+ printf( "%s\n", SDL_GetError() ); -+ printf( "Disabling sound and continuing...\n" ); -+ audio_on = 0; -+ } - if ( SDL_SetVideoMode( 640, 480, BITDEPTH, - (fullscreen?SDL_FULLSCREEN:0) | SDL_HWSURFACE | SDL_DOUBLEBUF ) < 0 ) { - printf( "%s\n", SDL_GetError() ); -@@ -592,7 +597,8 @@ - #ifdef AUDIO_ENABLED - if ( Mix_OpenAudio( audio_freq, audio_format, audio_channels, 1024 ) < 0 ) { - printf( "%s\n", SDL_GetError() ); -- exit(1); -+ printf("Disabling sound and continuing\n"); -+ audio_on = 0; - } - audio_mix_channel_count = Mix_AllocateChannels( 16 ); - #endif Copied: packages/tags/barrage/1.0.3-1/debian/patches/02_nosound.diff (from rev 12007, packages/trunk/barrage/debian/patches/02_nosound.diff) =================================================================== --- packages/tags/barrage/1.0.3-1/debian/patches/02_nosound.diff (rev 0) +++ packages/tags/barrage/1.0.3-1/debian/patches/02_nosound.diff 2011-03-24 14:16:05 UTC (rev 12010) @@ -0,0 +1,76 @@ +Author: Barry deFreese <[email protected]> +Description: fix startup when no sound device is available +Bug: http://sf.net/support/tracker.php?aid=3240753 +Bug-Debian: http://bugs.debian.org/449328 +--- a/src/data.c ++++ b/src/data.c +@@ -51,6 +51,8 @@ + int cursor_w = 0, cursor_x_offset = 0; + int gun_w = 0, gun_h = 0; + ++extern int audio_on; ++ + extern SDL_Surface *screen; /* display */ + + #define SET_ALPHA( surf, alpha ) SDL_SetAlpha( surf, SDL_SRCALPHA | SDL_RLEACCEL, alpha ) +@@ -234,6 +236,7 @@ + ft_menu = ft_chart; ft_menu_highlight = ft_chart_highlight; + + #ifdef AUDIO_ENABLED ++ if ( audio_on ) { + wav_expl1 = data_load_sound( "expl1.wav" ); + wav_expl2 = data_load_sound( "expl2.wav" ); + wav_expl3 = data_load_sound( "expl3.wav" ); +@@ -241,6 +244,7 @@ + wav_cannon2 = data_load_sound( "gunfire.wav" ); + wav_click = data_load_sound( "click.wav" ); + wav_highlight = data_load_sound( "highlight.wav" ); ++ } + #endif + + cr_empty = data_create_cursor( 16, 16, 8, 8, +@@ -288,6 +292,7 @@ + printf( "%i fonts deleted\n", ft_count ); + + #ifdef AUDIO_ENABLED ++ if ( audio_on ) { + data_free_sound( &wav_expl1 ); + data_free_sound( &wav_expl2 ); + data_free_sound( &wav_expl3 ); +@@ -295,6 +300,7 @@ + data_free_sound( &wav_click ); + data_free_sound( &wav_highlight ); + printf( "%i sounds deleted\n", wav_count ); ++ } + #endif + + data_free_cursor( &cr_empty ); +--- a/src/main.c ++++ b/src/main.c +@@ -576,10 +576,15 @@ + + set_player_name_from_env(); + +- if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_AUDIO ) < 0 ) { ++ if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_TIMER ) < 0 ) { + printf( "%s\n", SDL_GetError() ); + exit(1); + } ++ else if ( SDL_InitSubSystem( SDL_INIT_AUDIO ) < 0 ) { ++ printf( "%s\n", SDL_GetError() ); ++ printf( "Disabling sound and continuing...\n" ); ++ audio_on = 0; ++ } + if ( SDL_SetVideoMode( 640, 480, BITDEPTH, + (fullscreen?SDL_FULLSCREEN:0) | SDL_HWSURFACE | SDL_DOUBLEBUF ) < 0 ) { + printf( "%s\n", SDL_GetError() ); +@@ -592,7 +597,8 @@ + #ifdef AUDIO_ENABLED + if ( Mix_OpenAudio( audio_freq, audio_format, audio_channels, 1024 ) < 0 ) { + printf( "%s\n", SDL_GetError() ); +- exit(1); ++ printf("Disabling sound and continuing\n"); ++ audio_on = 0; + } + audio_mix_channel_count = Mix_AllocateChannels( 16 ); + #endif Deleted: packages/tags/barrage/1.0.3-1/debian/patches/fix-FTBFS-with-GCC-4.5.patch =================================================================== --- packages/trunk/barrage/debian/patches/fix-FTBFS-with-GCC-4.5.patch 2011-03-24 10:16:24 UTC (rev 11995) +++ packages/tags/barrage/1.0.3-1/debian/patches/fix-FTBFS-with-GCC-4.5.patch 2011-03-24 14:16:05 UTC (rev 12010) @@ -1,11 +0,0 @@ ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -185,7 +185,7 @@ - SFont.c - - barrage_LDFLAGS = --barrage_LDADD = @audio_lib@ -+barrage_LDADD = @audio_lib@ -lm - EXTRA_DIST = \ - defs.h particle.h shots.h units.h\ - data.h bfield.h menu.h SFont.h chart.h Copied: packages/tags/barrage/1.0.3-1/debian/patches/fix-FTBFS-with-GCC-4.5.patch (from rev 12007, packages/trunk/barrage/debian/patches/fix-FTBFS-with-GCC-4.5.patch) =================================================================== --- packages/tags/barrage/1.0.3-1/debian/patches/fix-FTBFS-with-GCC-4.5.patch (rev 0) +++ packages/tags/barrage/1.0.3-1/debian/patches/fix-FTBFS-with-GCC-4.5.patch 2011-03-24 14:16:05 UTC (rev 12010) @@ -0,0 +1,15 @@ +Author: Ilya Barygin <[email protected]> +Description: link with the math library to fix build failure with GCC 4.5 +Bug: http://sf.net/support/tracker.php?aid=3240772 +Bug-Debian: http://bugs.debian.org/553932 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -14,7 +14,7 @@ + SFont.c + + barrage_LDFLAGS = +-barrage_LDADD = @audio_lib@ ++barrage_LDADD = @audio_lib@ -lm + + EXTRA_DIST = \ + defs.h particle.h shots.h units.h\ Deleted: packages/tags/barrage/1.0.3-1/debian/patches/fix_sprintf =================================================================== --- packages/trunk/barrage/debian/patches/fix_sprintf 2011-03-24 10:16:24 UTC (rev 11995) +++ packages/tags/barrage/1.0.3-1/debian/patches/fix_sprintf 2011-03-24 14:16:05 UTC (rev 12010) @@ -1,11 +0,0 @@ ---- a/src/SFont.c -+++ b/src/SFont.c -@@ -182,7 +182,7 @@ - if ((ch=='\b')&&(strlen(text)>0)) - text[strlen(text)-1]='\0'; - else if (ch!='\b') -- sprintf(text,"%s%c",text,ch); -+ sprintf(text + strlen(text),"%c",ch); - /* quick hack to use limited number of characters rather than - * pixels - Michael Speck */ - if (strlen(text)/*TextWidth2(Font,text)*/>PixelWidth) Copied: packages/tags/barrage/1.0.3-1/debian/patches/fix_sprintf (from rev 12007, packages/trunk/barrage/debian/patches/fix_sprintf) =================================================================== --- packages/tags/barrage/1.0.3-1/debian/patches/fix_sprintf (rev 0) +++ packages/tags/barrage/1.0.3-1/debian/patches/fix_sprintf 2011-03-24 14:16:05 UTC (rev 12010) @@ -0,0 +1,15 @@ +Author: Gonéri Le Bouder <[email protected]> +Description: fix use of sprintf +Bug: http://sf.net/support/tracker.php?aid=3240767 +Bug-Debian: http://lists.debian.org/debian-devel/2008/12/msg01079.html +--- a/src/SFont.c ++++ b/src/SFont.c +@@ -182,7 +182,7 @@ + if ((ch=='\b')&&(strlen(text)>0)) + text[strlen(text)-1]='\0'; + else if (ch!='\b') +- sprintf(text,"%s%c",text,ch); ++ sprintf(text + strlen(text),"%c",ch); + /* quick hack to use limited number of characters rather than + * pixels - Michael Speck */ + if (strlen(text)/*TextWidth2(Font,text)*/>PixelWidth) Deleted: packages/tags/barrage/1.0.3-1/debian/rules =================================================================== --- packages/trunk/barrage/debian/rules 2011-03-24 10:16:24 UTC (rev 11995) +++ packages/tags/barrage/1.0.3-1/debian/rules 2011-03-24 14:16:05 UTC (rev 12010) @@ -1,13 +0,0 @@ -#!/usr/bin/make -f -%: - dh $@ --with autotools_dev - -override_dh_auto_configure: - dh_auto_configure -- --bindir=\$${prefix}/games - - -override_dh_auto_install: - dh_auto_install - mkdir -p $(CURDIR)/debian/barrage/usr/share/pixmaps/ - cp debian/barrage.xpm $(CURDIR)/debian/barrage/usr/share/pixmaps/ - echo "Icon=barrage" >> $(CURDIR)/debian/barrage/usr/share/applications/barrage.desktop Copied: packages/tags/barrage/1.0.3-1/debian/rules (from rev 12006, packages/trunk/barrage/debian/rules) =================================================================== --- packages/tags/barrage/1.0.3-1/debian/rules (rev 0) +++ packages/tags/barrage/1.0.3-1/debian/rules 2011-03-24 14:16:05 UTC (rev 12010) @@ -0,0 +1,6 @@ +#!/usr/bin/make -f +%: + dh $@ --parallel --with autotools_dev --with autoreconf + +override_dh_auto_configure: + dh_auto_configure -- --bindir=\$${prefix}/games _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
