r8253 - in packages/trunk/xmoto/debian: . patches

[Barry deFreese]

Author: bddebian-guest
Date: 2008-10-11 13:37:52 +0000 (Sat, 11 Oct 2008)
New Revision: 8253

Added:
   packages/trunk/xmoto/debian/patches/fix_segfault2.patch
Modified:
   packages/trunk/xmoto/debian/
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/control
   packages/trunk/xmoto/debian/patches/series
Log:
  [ Barry deFreese ]
  * Don't segfault on NULL db values. (Closes: #492414).
    + Thanks to Gustavo Noronha Silva for the patch.
  * Add myself to uploaders.
Add svn-bp properties.



Property changes on: packages/trunk/xmoto/debian
___________________________________________________________________
Name: svn-bp:tagsUrl
   + svn+ssh://svn.debian.org/svn/pkg-games/packages/tags/xmoto
Name: svn-bp:origUrl
   + http://pkg-games.alioth.debian.org/tarballs/xmoto_0.4.2.orig.tar.gz

Modified: packages/trunk/xmoto/debian/changelog
===================================================================
--- packages/trunk/xmoto/debian/changelog	2008-10-11 05:55:46 UTC (rev 8252)
+++ packages/trunk/xmoto/debian/changelog	2008-10-11 13:37:52 UTC (rev 8253)
@@ -1,3 +1,12 @@
+xmoto (0.4.2-3) unstable; urgency=med
+
+  [ Barry deFreese ]
+  * Don't segfault on NULL db values. (Closes: #492414).
+    + Thanks to Gustavo Noronha Silva for the patch.
+  * Add myself to uploaders.
+
+ -- Barry deFreese <bdefreese at comcast.net>  Sat, 11 Oct 2008 09:34:05 -0400
+
 xmoto (0.4.2-2) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/xmoto/debian/control
===================================================================
--- packages/trunk/xmoto/debian/control	2008-10-11 05:55:46 UTC (rev 8252)
+++ packages/trunk/xmoto/debian/control	2008-10-11 13:37:52 UTC (rev 8253)
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Samuel Mimram <smimram at debian.org>
+Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Samuel Mimram <smimram at debian.org>, Barry deFreese <bdefreese at debian.org>
 Build-Depends: debhelper (>= 4.0.0), dpkg-dev (>= 1.13.19), autotools-dev, quilt,
  libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libjpeg62-dev, libpng12-dev,
  zlib1g-dev, libgl1-mesa-dev | libgl-dev, libode0-dev, liblua5.1-0-dev,

Added: packages/trunk/xmoto/debian/patches/fix_segfault2.patch
===================================================================
--- packages/trunk/xmoto/debian/patches/fix_segfault2.patch	                        (rev 0)
+++ packages/trunk/xmoto/debian/patches/fix_segfault2.patch	2008-10-11 13:37:52 UTC (rev 8253)
@@ -0,0 +1,13 @@
+Index: xmoto-0.4.2/src/states/StateScene.cpp
+===================================================================
+--- xmoto-0.4.2.orig/src/states/StateScene.cpp	2008-10-11 09:16:03.000000000 -0400
++++ xmoto-0.4.2/src/states/StateScene.cpp	2008-10-11 09:17:46.000000000 -0400
+@@ -540,7 +540,7 @@
+       int v_nbPlayed, v_nbDied, v_nbCompleted, v_nbRestart, v_playedTime;
+       std::string v_idLevel = m_universe->getScenes()[0]->getLevelSrc()->Id();
+       
+-      v_result = v_pDb->readDB("SELECT nbPlayed, nbDied, nbCompleted, nbRestarted, playedTime "
++      v_result = v_pDb->readDB("SELECT IFNULL(nbPlayed,0), IFNULL(nbDied,0), IFNULL(nbCompleted,0), IFNULL(nbRestarted,0), IFNULL(playedTime,0) "
+ 			       "FROM stats_profiles_levels "
+ 			       "WHERE id_profile=\"" + xmDatabase::protectString(XMSession::instance()->profile()) + "\" "
+ 			       "AND id_level=\""     + xmDatabase::protectString(v_idLevel) + "\";",

Modified: packages/trunk/xmoto/debian/patches/series
===================================================================
--- packages/trunk/xmoto/debian/patches/series	2008-10-11 05:55:46 UTC (rev 8252)
+++ packages/trunk/xmoto/debian/patches/series	2008-10-11 13:37:52 UTC (rev 8253)
@@ -1,2 +1,3 @@
 fix_segfault.patch
 desktop.patch
+fix_segfault2.patch