r6378 - in packages/trunk/barrage/debian: . patches

[Barry deFreese]

Author: bddebian-guest
Date: 2008-03-30 13:35:23 +0000 (Sun, 30 Mar 2008)
New Revision: 6378

Modified:
   packages/trunk/barrage/debian/changelog
   packages/trunk/barrage/debian/control
   packages/trunk/barrage/debian/patches/02_nosound.diff
Log:
  * Add myself to uploaders.
  * Remove Homepage from package description.
Move to unstable to prepare for upload.
Refresh nosound patch, was missing main.c fixes.


Modified: packages/trunk/barrage/debian/changelog
===================================================================
--- packages/trunk/barrage/debian/changelog	2008-03-30 05:53:19 UTC (rev 6377)
+++ packages/trunk/barrage/debian/changelog	2008-03-30 13:35:23 UTC (rev 6378)
@@ -1,4 +1,4 @@
-barrage (1.0.2-2) UNRELEASED; urgency=low
+barrage (1.0.2-2) unstable; urgency=low
 
   [ Gonéri Le Bouder ]
   * copright file:
@@ -29,6 +29,8 @@
     + 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

Modified: packages/trunk/barrage/debian/control
===================================================================
--- packages/trunk/barrage/debian/control	2008-03-30 05:53:19 UTC (rev 6377)
+++ packages/trunk/barrage/debian/control	2008-03-30 13:35:23 UTC (rev 6378)
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>
+Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>, Barry deFreese <bddebian at comcast.net>
 Build-Depends: debhelper (>= 5.0.0), quilt, libsdl1.2-dev, libsdl-mixer1.2-dev, binutils (>= 2.14.90.0.7)
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/barrage/
@@ -18,5 +18,3 @@
  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.
- .
-  Homepage: http://lgames.sourceforge.net/index.php?project=Barrage

Modified: packages/trunk/barrage/debian/patches/02_nosound.diff
===================================================================
--- packages/trunk/barrage/debian/patches/02_nosound.diff	2008-03-30 05:53:19 UTC (rev 6377)
+++ packages/trunk/barrage/debian/patches/02_nosound.diff	2008-03-30 13:35:23 UTC (rev 6378)
@@ -1,7 +1,7 @@
 Index: barrage-1.0.2/src/data.c
 ===================================================================
---- barrage-1.0.2.orig/src/data.c	2008-03-30 01:38:31.000000000 -0400
-+++ barrage-1.0.2/src/data.c	2008-03-30 01:40:53.000000000 -0400
+--- 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 @@
  int cursor_w = 0, cursor_x_offset = 0;
  int gun_w = 0, gun_h = 0;
@@ -43,3 +43,34 @@
  #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 @@
+ 	
+   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() );
+     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() );
+@@ -573,7 +578,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