r2973 - in packages/trunk/chromium/debian: . patches

[Emmet Hikory]

Author: persia-guest
Date: 2007-06-18 18:18:28 +0000 (Mon, 18 Jun 2007)
New Revision: 2973

Added:
   packages/trunk/chromium/debian/patches/45_unpause_onquit
   packages/trunk/chromium/debian/patches/55_mouse-restart
Modified:
   packages/trunk/chromium/debian/changelog
   packages/trunk/chromium/debian/patches/series
Log:
Added patch from Ubuntu to start unpaused.  Applied patch from bug 426817.


Modified: packages/trunk/chromium/debian/changelog
===================================================================
--- packages/trunk/chromium/debian/changelog	2007-06-18 14:41:06 UTC (rev 2972)
+++ packages/trunk/chromium/debian/changelog	2007-06-18 18:18:28 UTC (rev 2973)
@@ -1,10 +1,15 @@
 chromium (0.9.12-14) UNRELEASED; urgency=low
 
+  [ Reinhard Tartler ]
   * use /bin/bash instead of /bin/sh in configure to avoid FTBFS with
     /bin/sh pointing to dash. This causes build failiure in ubuntu.
 
- -- Reinhard Tartler <siretart at tauware.de>  Sat, 26 May 2007 22:54:33 +0200
+  [ Emmet Hikory ]
+  * Start game unpaused
+  * Allow restart with mouse click (Closes: 426817)
 
+ -- Emmet Hikory <emmet.hikory at gmail.com>  Tue, 19 Jun 2007 03:11:56 +0900
+
 chromium (0.9.12-13) unstable; urgency=low
 
   * New maintainer (Closes: #417805).

Added: packages/trunk/chromium/debian/patches/45_unpause_onquit
===================================================================
--- packages/trunk/chromium/debian/patches/45_unpause_onquit	                        (rev 0)
+++ packages/trunk/chromium/debian/patches/45_unpause_onquit	2007-06-18 18:18:28 UTC (rev 2973)
@@ -0,0 +1,12 @@
+Index: chromium-0.9.12/src/Global.cpp
+===================================================================
+--- chromium-0.9.12.orig/src/Global.cpp	2007-06-17 22:42:27.000000000 +0200
++++ chromium-0.9.12/src/Global.cpp	2007-06-17 22:42:52.000000000 +0200
+@@ -143,6 +143,7 @@
+ 	explosions->clear();
+ 	hero->newGame();
+ 	hero->setLives(4);
++	game_pause = false;
+ 	
+ //	Global::generateRandom();
+ 	itemAdd->loadScreenItems("");

Added: packages/trunk/chromium/debian/patches/55_mouse-restart
===================================================================
--- packages/trunk/chromium/debian/patches/55_mouse-restart	                        (rev 0)
+++ packages/trunk/chromium/debian/patches/55_mouse-restart	2007-06-18 18:18:28 UTC (rev 2973)
@@ -0,0 +1,15 @@
+Index: chromium-0.9.12/src/MainSDL_Event.cpp
+===================================================================
+--- chromium-0.9.12.orig/src/MainSDL_Event.cpp	2007-06-19 02:55:33.000000000 +0900
++++ chromium-0.9.12/src/MainSDL_Event.cpp	2007-06-19 02:56:02.000000000 +0900
+@@ -396,6 +396,10 @@
+ 				break;
+ 		}
+ 	}
++	else if(game->gameMode == Global::HeroDead)
++	{
++		game->menu->keyHit(MainToolkit::KeyEnter);
++	}
+ 	
+ }
+ 

Modified: packages/trunk/chromium/debian/patches/series
===================================================================
--- packages/trunk/chromium/debian/patches/series	2007-06-18 14:41:06 UTC (rev 2972)
+++ packages/trunk/chromium/debian/patches/series	2007-06-18 18:18:28 UTC (rev 2973)
@@ -6,4 +6,6 @@
 30_new_openAL.dpatch
 35_powerup_crash.diff
 40_sdl_quit.diff
+45_unpause_onquit
 50_fix-configure
+55_mouse-restart