r4261 - in packages/trunk/starfighter/debian: . patches

Gonéri Le Bouder goneri-guest at alioth.debian.org
Sat Sep 22 11:29:25 UTC 2007 

Author: goneri-guest
Date: 2007-09-22 11:29:25 +0000 (Sat, 22 Sep 2007)
New Revision: 4261

Modified:
   packages/trunk/starfighter/debian/changelog
   packages/trunk/starfighter/debian/control
   packages/trunk/starfighter/debian/patches/10_nobusyloop.diff
   packages/trunk/starfighter/debian/rules
   packages/trunk/starfighter/debian/starfighter.install
Log:
+  * update 10_nobusyloop.diff to fix the build with gcc 4.2
+    thanks Brian m. Carlson for the patch (Closes: #385714)
+  * make the package binNMU by replace starfighter-data (= ${Source-Version})
+    by starfighter-data (= ${source:Version}), thanks Lior Kaplan
+    (Closes: #435958)
+  * clean the starfighter binary (Closes: #424236)
+  * do not ignore make clean return anymore
+  * add myself in Uploaders:


Modified: packages/trunk/starfighter/debian/changelog
===================================================================
--- packages/trunk/starfighter/debian/changelog	2007-09-22 09:28:29 UTC (rev 4260)
+++ packages/trunk/starfighter/debian/changelog	2007-09-22 11:29:25 UTC (rev 4261)
@@ -1,11 +1,17 @@
-starfighter (1.1-7) UNRELEASED; urgency=low
+starfighter (1.1-7) unstable; urgency=low
 
   [ Eddy Petrișor ]
   * fix Homepage semifield
 
   [ Gonéri Le Bouder ]
-  * Add patch by Brian m. Carlson to fix the build with gcc 4.2
-    (Closes: #385714)
+  * update 10_nobusyloop.diff to fix the build with gcc 4.2
+    thanks Brian m. Carlson for the patch (Closes: #385714)
+  * make the package binNMU by replace starfighter-data (= ${Source-Version})
+    by starfighter-data (= ${source:Version}), thanks Lior Kaplan
+    (Closes: #435958)
+  * clean the starfighter binary (Closes: #424236)
+  * do not ignore make clean return anymore
+  * add myself in Uploaders:
 
   [ Jon Dowland ]
   * update menu section to "Games/Action" for menu policy transition.
@@ -14,7 +20,7 @@
   [ Cyril Brulebois ]
   * Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
 
- -- Jon Dowland <jon at alcopop.org>  Thu, 12 Jul 2007 12:07:04 +0100
+ -- Gonéri Le Bouder <goneri at rulezlan.org>  Sat, 22 Sep 2007 10:27:49 +0000
 
 starfighter (1.1-6) unstable; urgency=low
 

Modified: packages/trunk/starfighter/debian/control
===================================================================
--- packages/trunk/starfighter/debian/control	2007-09-22 09:28:29 UTC (rev 4260)
+++ packages/trunk/starfighter/debian/control	2007-09-22 11:29:25 UTC (rev 4261)
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Bartosz Fenski <fenio at debian.org>, Alexander Schmehl <tolimar at debian.org>
+Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Bartosz Fenski <fenio at debian.org>, Alexander Schmehl <tolimar at debian.org>, Gonéri Le Bouder <goneri at rulezlan.org>
 Build-Depends: debhelper (>= 4.0.0), quilt, python, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/starfighter/
@@ -10,7 +10,7 @@
 
 Package: starfighter
 Architecture: any
-Depends: ${shlibs:Depends}, starfighter-data (= ${Source-Version})
+Depends: ${shlibs:Depends}, starfighter-data (= ${source:Version})
 Description: 2D scrolling shooter game
  After decades of war one company, who had gained powerful supplying both
  sides with weaponary, steps forwards and crushes both warring factions

Modified: packages/trunk/starfighter/debian/patches/10_nobusyloop.diff
===================================================================
--- packages/trunk/starfighter/debian/patches/10_nobusyloop.diff	2007-09-22 09:28:29 UTC (rev 4260)
+++ packages/trunk/starfighter/debian/patches/10_nobusyloop.diff	2007-09-22 11:29:25 UTC (rev 4261)
@@ -32,7 +32,7 @@
 -			// Do nothing. If we were to insert an SDL_Delay(1) in here
 -			// then we would actually lose around 10 frames per second!!
 -		}
-+		SDL_Delay(frameLimit + 16 - std::max(std::min(SDL_GetTicks(), 0), 16));
++		SDL_Delay(frameLimit + 16 - max(std::min(SDL_GetTicks(), 0), 16));
  		frameLimit = SDL_GetTicks();
  	}
  
@@ -45,7 +45,7 @@
  
  		// Limit us to 60 frame a second
 -		while (SDL_GetTicks() < (frameLimit + 16)){}
-+		SDL_Delay(frameLimit + 16 - std::max(std::min(SDL_GetTicks(), 0), 16));
++		SDL_Delay(frameLimit + 16 - max(std::min(SDL_GetTicks(), 0), 16));
  		frameLimit = SDL_GetTicks();
  	}
  
@@ -78,7 +78,7 @@
  			graphics.blit(graphics.messageBox, (800 - graphics.messageBox->w) / 2, 500);
  
 -		while (SDL_GetTicks() < (frameLimit + 16)){}
-+		SDL_Delay(frameLimit + 16 - std::max(std::min(SDL_GetTicks(), 0), 16));
++		SDL_Delay(frameLimit + 16 - max(std::min(SDL_GetTicks(), 0), 16));
  		frameLimit = SDL_GetTicks();
  		
  		if (engine.keyState[SDLK_ESCAPE])
@@ -91,7 +91,7 @@
  		}
  
 -		while (SDL_GetTicks() < (frameLimit + 16)){}
-+		SDL_Delay(frameLimit + 16 - std::max(std::min(SDL_GetTicks(), 0), 16));
++		SDL_Delay(frameLimit + 16 - max(std::min(SDL_GetTicks(), 0), 16));
  		frameLimit = SDL_GetTicks();
  	}
  }
@@ -100,7 +100,7 @@
  
  		// Limit us to 60 frame a second
 -		while (SDL_GetTicks() < (frameLimit + 16)){}
-+		SDL_Delay(frameLimit + 16 - std::max(std::min(SDL_GetTicks(), 0), 16));
++		SDL_Delay(frameLimit + 16 - max(std::min(SDL_GetTicks(), 0), 16));
  		frameLimit = SDL_GetTicks();
  	}
  
@@ -109,7 +109,7 @@
  		SDL_FillRect(graphics.screen, &r2, graphics.black);
  
 -		while (SDL_GetTicks() < (frameLimit + 16)){}
-+		SDL_Delay(frameLimit + 16 - std::max(std::min(SDL_GetTicks(), 0), 16));
++		SDL_Delay(frameLimit + 16 - max(std::min(SDL_GetTicks(), 0), 16));
  		frameLimit = SDL_GetTicks();
  	}
  

Modified: packages/trunk/starfighter/debian/rules
===================================================================
--- packages/trunk/starfighter/debian/rules	2007-09-22 09:28:29 UTC (rev 4260)
+++ packages/trunk/starfighter/debian/rules	2007-09-22 11:29:25 UTC (rev 4261)
@@ -33,8 +33,8 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
-	-$(MAKE) clean
+	rm -f build-stamp configure-stamp starfighter
+	[ ! -f makefile ] || $(MAKE) clean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	rm -Rf pak
 	rm -f debian/starfighter.pak

Modified: packages/trunk/starfighter/debian/starfighter.install
===================================================================
--- packages/trunk/starfighter/debian/starfighter.install	2007-09-22 09:28:29 UTC (rev 4260)
+++ packages/trunk/starfighter/debian/starfighter.install	2007-09-22 11:29:25 UTC (rev 4261)
@@ -1,2 +1,3 @@
 starfighter /usr/games/
-docs/* /usr/share/doc/starfighter/html/
\ No newline at end of file
+docs/* /usr/share/doc/starfighter/html/
+

More information about the Pkg-games-commits mailing list