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

[Barry deFreese]

Author: bddebian-guest
Date: 2008-03-30 05:46:35 +0000 (Sun, 30 Mar 2008)
New Revision: 6376

Added:
   packages/trunk/barrage/debian/patches/
   packages/trunk/barrage/debian/patches/01_getopt.diff
   packages/trunk/barrage/debian/patches/02_nosound.diff
   packages/trunk/barrage/debian/patches/series
Modified:
   packages/trunk/barrage/debian/changelog
   packages/trunk/barrage/debian/rules
Log:
  * 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.
Clean up changelog a little.


Modified: packages/trunk/barrage/debian/changelog
===================================================================
--- packages/trunk/barrage/debian/changelog	2008-03-29 20:25:14 UTC (rev 6375)
+++ packages/trunk/barrage/debian/changelog	2008-03-30 05:46:35 UTC (rev 6376)
@@ -1,7 +1,6 @@
 barrage (1.0.2-2) UNRELEASED; urgency=low
 
   [ Gonéri Le Bouder ]
-  * Standards-Version: 3.7.2
   * copright file:
    - update Debian Games Team home URL
    - change name from pkg-games to Debian Games Team
@@ -22,13 +21,19 @@
   * 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 (No changes needed)
+  * 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.
 
   [ Jon Dowland ]
   * add Homepage: control field to source stanza
 
- -- Jon Dowland <jon at alcopop.org>  Mon, 03 Dec 2007 17:42:04 +0000
+ -- Barry deFreese <bddebian at comcast.net>  Sun, 30 Mar 2008 01:15:36 -0400
 
 barrage (1.0.2-1) unstable; urgency=low
 

Added: packages/trunk/barrage/debian/patches/01_getopt.diff
===================================================================
--- packages/trunk/barrage/debian/patches/01_getopt.diff	                        (rev 0)
+++ packages/trunk/barrage/debian/patches/01_getopt.diff	2008-03-30 05:46:35 UTC (rev 6376)
@@ -0,0 +1,13 @@
+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 @@
+ 
+ int main( int argc, char **argv )
+ {
+-  char c;
++  int c;
+   
+   printf( "BARRAGE v%s\n", VERSION );
+   printf( "Copyright 2003-2005 Michael Speck (http://lgames.sf.net)\n" );

Added: packages/trunk/barrage/debian/patches/02_nosound.diff
===================================================================
--- packages/trunk/barrage/debian/patches/02_nosound.diff	                        (rev 0)
+++ packages/trunk/barrage/debian/patches/02_nosound.diff	2008-03-30 05:46:35 UTC (rev 6376)
@@ -0,0 +1,45 @@
+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
+@@ -53,6 +53,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 )
+@@ -236,6 +238,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" );
+@@ -245,6 +248,7 @@
+ 	wav_scream2 = data_load_sound( "scream2.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 @@
+ 	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 );
+@@ -301,6 +306,7 @@
+ 	data_free_sound( &wav_click );
+ 	data_free_sound( &wav_highlight );
+ 	printf( "%i sounds deleted\n", wav_count );
++    }
+ #endif
+ 
+ 	data_free_cursor( &cr_empty );

Added: packages/trunk/barrage/debian/patches/series
===================================================================
--- packages/trunk/barrage/debian/patches/series	                        (rev 0)
+++ packages/trunk/barrage/debian/patches/series	2008-03-30 05:46:35 UTC (rev 6376)
@@ -0,0 +1 @@
+01_getopt.diff

Modified: packages/trunk/barrage/debian/rules
===================================================================
--- packages/trunk/barrage/debian/rules	2008-03-29 20:25:14 UTC (rev 6375)
+++ packages/trunk/barrage/debian/rules	2008-03-30 05:46:35 UTC (rev 6376)
@@ -2,6 +2,7 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+include /usr/share/quilt/quilt.make
 
 CFLAGS = -Wall -g
 
@@ -16,7 +17,7 @@
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=\$${prefix}/games
 
 
-build: build-stamp
+build: patch build-stamp
 
 build-stamp:  config.status
 	dh_testdir
@@ -25,7 +26,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp