Author: pabs Date: 2011-03-24 10:02:14 +0000 (Thu, 24 Mar 2011) New Revision: 11993
Modified: packages/trunk/barrage/debian/changelog packages/trunk/barrage/debian/patches/01_getopt.diff packages/trunk/barrage/debian/patches/02_nosound.diff packages/trunk/barrage/debian/patches/fix_sprintf Log: Refresh patches Modified: packages/trunk/barrage/debian/changelog =================================================================== --- packages/trunk/barrage/debian/changelog 2011-03-24 09:51:49 UTC (rev 11992) +++ packages/trunk/barrage/debian/changelog 2011-03-24 10:02:14 UTC (rev 11993) @@ -13,6 +13,7 @@ * Clean up the watch file * Fix games team URL in copyright file * Wrap the menu file one attribute per line + * Refresh patches -- Gonéri Le Bouder <[email protected]> Mon, 03 Jan 2011 22:09:01 +0100 Modified: packages/trunk/barrage/debian/patches/01_getopt.diff =================================================================== --- packages/trunk/barrage/debian/patches/01_getopt.diff 2011-03-24 09:51:49 UTC (rev 11992) +++ packages/trunk/barrage/debian/patches/01_getopt.diff 2011-03-24 10:02:14 UTC (rev 11993) @@ -1,8 +1,6 @@ -Index: barrage-1.0.2/src/main.c -=================================================================== ---- barrage-1.0.2.orig/src/main.c 2008-03-29 22:22:05.000000000 -0400 -+++ barrage-1.0.2/src/main.c 2008-03-29 22:22:26.000000000 -0400 -@@ -538,7 +538,7 @@ +--- a/src/main.c ++++ b/src/main.c +@@ -555,7 +555,7 @@ int main( int argc, char **argv ) { @@ -10,4 +8,4 @@ + int c; printf( "BARRAGE v%s\n", VERSION ); - printf( "Copyright 2003-2005 Michael Speck (http://lgames.sf.net)\n" ); + printf( "Copyright 2003-2010 Michael Speck (http://lgames.sf.net)\n" ); Modified: packages/trunk/barrage/debian/patches/02_nosound.diff =================================================================== --- packages/trunk/barrage/debian/patches/02_nosound.diff 2011-03-24 09:51:49 UTC (rev 11992) +++ packages/trunk/barrage/debian/patches/02_nosound.diff 2011-03-24 10:02:14 UTC (rev 11993) @@ -1,8 +1,6 @@ -Index: barrage-1.0.2/src/data.c -=================================================================== ---- barrage-1.0.2.orig/src/data.c 2005-02-14 13:50:02.000000000 -0500 -+++ barrage-1.0.2/src/data.c 2008-03-30 09:21:15.000000000 -0400 -@@ -53,6 +53,8 @@ +--- 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; @@ -11,7 +9,7 @@ extern SDL_Surface *screen; /* display */ #define SET_ALPHA( surf, alpha ) SDL_SetAlpha( surf, SDL_SRCALPHA | SDL_RLEACCEL, alpha ) -@@ -236,6 +238,7 @@ +@@ -234,6 +236,7 @@ ft_menu = ft_chart; ft_menu_highlight = ft_chart_highlight; #ifdef AUDIO_ENABLED @@ -19,15 +17,15 @@ wav_expl1 = data_load_sound( "expl1.wav" ); wav_expl2 = data_load_sound( "expl2.wav" ); wav_expl3 = data_load_sound( "expl3.wav" ); -@@ -245,6 +248,7 @@ - wav_scream2 = data_load_sound( "scream2.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, -@@ -292,6 +296,7 @@ +@@ -288,6 +292,7 @@ printf( "%i fonts deleted\n", ft_count ); #ifdef AUDIO_ENABLED @@ -35,7 +33,7 @@ data_free_sound( &wav_expl1 ); data_free_sound( &wav_expl2 ); data_free_sound( &wav_expl3 ); -@@ -301,6 +306,7 @@ +@@ -295,6 +300,7 @@ data_free_sound( &wav_click ); data_free_sound( &wav_highlight ); printf( "%i sounds deleted\n", wav_count ); @@ -43,14 +41,12 @@ #endif data_free_cursor( &cr_empty ); -Index: barrage-1.0.2/src/main.c -=================================================================== ---- barrage-1.0.2.orig/src/main.c 2008-03-30 09:21:37.000000000 -0400 -+++ barrage-1.0.2/src/main.c 2008-03-30 09:24:22.000000000 -0400 -@@ -557,10 +557,15 @@ +--- a/src/main.c ++++ b/src/main.c +@@ -576,10 +576,15 @@ + + set_player_name_from_env(); - srand( time(0) ); - - 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() ); @@ -64,7 +60,7 @@ if ( SDL_SetVideoMode( 640, 480, BITDEPTH, (fullscreen?SDL_FULLSCREEN:0) | SDL_HWSURFACE | SDL_DOUBLEBUF ) < 0 ) { printf( "%s\n", SDL_GetError() ); -@@ -573,7 +578,8 @@ +@@ -592,7 +597,8 @@ #ifdef AUDIO_ENABLED if ( Mix_OpenAudio( audio_freq, audio_format, audio_channels, 1024 ) < 0 ) { printf( "%s\n", SDL_GetError() ); Modified: packages/trunk/barrage/debian/patches/fix_sprintf =================================================================== --- packages/trunk/barrage/debian/patches/fix_sprintf 2011-03-24 09:51:49 UTC (rev 11992) +++ packages/trunk/barrage/debian/patches/fix_sprintf 2011-03-24 10:02:14 UTC (rev 11993) @@ -1,5 +1,5 @@ ---- barrage-1.0.2.orig/src/SFont.c -+++ barrage-1.0.2/src/SFont.c +--- a/src/SFont.c ++++ b/src/SFont.c @@ -182,7 +182,7 @@ if ((ch=='\b')&&(strlen(text)>0)) text[strlen(text)-1]='\0'; _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
