r5151 - in packages/trunk: ! dirs' list truncated !

[Peter De Wachter]

Author: pdewacht-guest
Date: 2008-01-01 14:28:19 +0000 (Tue, 01 Jan 2008)
New Revision: 5151

Added:
   packages/trunk/gunroar/debian/patches/avoid-segfault-when-sdl-fails.patch
   packages/trunk/torus-trooper/debian/patches/avoid-segfault-when-sdl-fails.patch
   packages/trunk/val-and-rick/debian/patches/avoid-segfault-when-sdl-fails.patch
Modified:
   packages/trunk/gunroar/debian/changelog
   packages/trunk/gunroar/debian/patches/series
   packages/trunk/torus-trooper/debian/changelog
   packages/trunk/torus-trooper/debian/patches/series
   packages/trunk/val-and-rick/debian/changelog
   packages/trunk/val-and-rick/debian/patches/series
Log:
Avoid segfault when SDL init dies (gunroar, torus-trooper, val-and-rick)


Modified: packages/trunk/gunroar/debian/changelog
===================================================================
--- packages/trunk/gunroar/debian/changelog	2008-01-01 14:20:58 UTC (rev 5150)
+++ packages/trunk/gunroar/debian/changelog	2008-01-01 14:28:19 UTC (rev 5151)
@@ -8,8 +8,9 @@
   [ Peter De Wachter ]
   * Fixed link command, patch from Arthur Loiret. (Closes: #458278)
   * Fixed typos. (Closes: #457639)
+  * Fixed segfault when SDL init fails.
 
- -- Peter De Wachter <pdewacht at gmail.com>  Tue, 01 Jan 2008 15:19:29 +0100
+ -- Peter De Wachter <pdewacht at gmail.com>  Tue, 01 Jan 2008 15:23:26 +0100
 
 gunroar (0.15.dfsg1-2) unstable; urgency=low
 

Added: packages/trunk/gunroar/debian/patches/avoid-segfault-when-sdl-fails.patch
===================================================================
--- packages/trunk/gunroar/debian/patches/avoid-segfault-when-sdl-fails.patch	                        (rev 0)
+++ packages/trunk/gunroar/debian/patches/avoid-segfault-when-sdl-fails.patch	2008-01-01 14:28:19 UTC (rev 5151)
@@ -0,0 +1,16 @@
+# Copyright (C) 2007  Peter De Wachter <pdewacht at gmail.com>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: gunroar-0.15.dfsg1/src/abagames/gr/gamemanager.d
+===================================================================
+--- gunroar-0.15.dfsg1.orig/src/abagames/gr/gamemanager.d	2007-12-31 21:07:04.000000000 +0100
++++ gunroar-0.15.dfsg1/src/abagames/gr/gamemanager.d	2007-12-31 21:07:28.000000000 +0100
+@@ -195,7 +195,7 @@
+   }
+ 
+   public void saveErrorReplay() {
+-    if (state == inGameState)
++    if (state !is null && state == inGameState)
+       inGameState.saveReplay("error.rpl");
+   }
+ 

Modified: packages/trunk/gunroar/debian/patches/series
===================================================================
--- packages/trunk/gunroar/debian/patches/series	2008-01-01 14:20:58 UTC (rev 5150)
+++ packages/trunk/gunroar/debian/patches/series	2008-01-01 14:28:19 UTC (rev 5151)
@@ -7,4 +7,5 @@
 makefile.patch
 gdc-0.24-semantics-for-version.patch
 window-resizing.patch
+avoid-segfault-when-sdl-fails.patch
 #gunroar-hot-iron.patch

Modified: packages/trunk/torus-trooper/debian/changelog
===================================================================
--- packages/trunk/torus-trooper/debian/changelog	2008-01-01 14:20:58 UTC (rev 5150)
+++ packages/trunk/torus-trooper/debian/changelog	2008-01-01 14:28:19 UTC (rev 5151)
@@ -9,8 +9,9 @@
   * Save high score when quitting via escape (Closes: #444372)
   * Make level selection more intuitive (Closes: #444948)
   * Fixed link command, patch from Arthur Loiret. (Closes: #458279)
+  * Fixed segfault when SDL init fails.
 
- -- Peter De Wachter <pdewacht at gmail.com>  Mon, 31 Dec 2007 23:02:25 +0100
+ -- Peter De Wachter <pdewacht at gmail.com>  Tue, 01 Jan 2008 15:24:55 +0100
 
 torus-trooper (0.22.dfsg1-1) unstable; urgency=low
 

Added: packages/trunk/torus-trooper/debian/patches/avoid-segfault-when-sdl-fails.patch
===================================================================
--- packages/trunk/torus-trooper/debian/patches/avoid-segfault-when-sdl-fails.patch	                        (rev 0)
+++ packages/trunk/torus-trooper/debian/patches/avoid-segfault-when-sdl-fails.patch	2008-01-01 14:28:19 UTC (rev 5151)
@@ -0,0 +1,16 @@
+# Copyright (C) 2007  Peter De Wachter <pdewacht at gmail.com>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: torus-trooper-0.22.dfsg1/src/abagames/tt/gamemanager.d
+===================================================================
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/gamemanager.d	2007-12-31 21:02:05.000000000 +0100
++++ torus-trooper-0.22.dfsg1/src/abagames/tt/gamemanager.d	2007-12-31 21:02:39.000000000 +0100
+@@ -149,7 +149,7 @@
+   }
+ 
+   public void saveErrorReplay() {
+-    if (state == inGameState)
++    if (state !is null && state == inGameState)
+       inGameState.saveReplay("error.rpl");
+   }
+ 

Modified: packages/trunk/torus-trooper/debian/patches/series
===================================================================
--- packages/trunk/torus-trooper/debian/patches/series	2008-01-01 14:20:58 UTC (rev 5150)
+++ packages/trunk/torus-trooper/debian/patches/series	2008-01-01 14:28:19 UTC (rev 5151)
@@ -7,3 +7,4 @@
 window-resizing.patch
 save-score-444372.patch
 level-select-444948.patch
+avoid-segfault-when-sdl-fails.patch

Modified: packages/trunk/val-and-rick/debian/changelog
===================================================================
--- packages/trunk/val-and-rick/debian/changelog	2008-01-01 14:20:58 UTC (rev 5150)
+++ packages/trunk/val-and-rick/debian/changelog	2008-01-01 14:28:19 UTC (rev 5151)
@@ -5,8 +5,9 @@
 
   [ Peter De Wachter ]
   * Fixed link command, patch from Arthur Loiret. (Closes: #458281)
+  * Fixed segfault when SDL init fails. (Closes: #456024)
 
- -- Peter De Wachter <pdewacht at gmail.com>  Mon, 31 Dec 2007 23:05:09 +0100
+ -- Peter De Wachter <pdewacht at gmail.com>  Tue, 01 Jan 2008 15:25:32 +0100
 
 val-and-rick (0.1a.dfsg1-1) unstable; urgency=low
 

Added: packages/trunk/val-and-rick/debian/patches/avoid-segfault-when-sdl-fails.patch
===================================================================
--- packages/trunk/val-and-rick/debian/patches/avoid-segfault-when-sdl-fails.patch	                        (rev 0)
+++ packages/trunk/val-and-rick/debian/patches/avoid-segfault-when-sdl-fails.patch	2008-01-01 14:28:19 UTC (rev 5151)
@@ -0,0 +1,16 @@
+# Copyright (C) 2007  Peter De Wachter <pdewacht at gmail.com>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: val-and-rick-0.1a.dfsg1/src/abagames/vr/gamemanager.d
+===================================================================
+--- val-and-rick-0.1a.dfsg1.orig/src/abagames/vr/gamemanager.d	2007-12-31 20:42:17.000000000 +0100
++++ val-and-rick-0.1a.dfsg1/src/abagames/vr/gamemanager.d	2007-12-31 20:57:38.000000000 +0100
+@@ -168,7 +169,7 @@
+   }
+ 
+   public void saveErrorReplay() {
+-    if (state == inGameState)
++    if (state !is null && state == inGameState)
+       inGameState.saveReplay("error.rpl");
+   }
+ 

Modified: packages/trunk/val-and-rick/debian/patches/series
===================================================================
--- packages/trunk/val-and-rick/debian/patches/series	2008-01-01 14:20:58 UTC (rev 5150)
+++ packages/trunk/val-and-rick/debian/patches/series	2008-01-01 14:28:19 UTC (rev 5151)
@@ -6,3 +6,4 @@
 homedir.patch
 resizable.patch
 endian-clean.patch
+avoid-segfault-when-sdl-fails.patch