r7997 - in packages/trunk/xmoto/debian: . patches
Miriam Ruiz
miriam at alioth.debian.org
Tue Aug 26 20:57:38 UTC 2008
Author: miriam
Date: 2008-08-26 20:57:38 +0000 (Tue, 26 Aug 2008)
New Revision: 7997
Added:
packages/trunk/xmoto/debian/patches/
packages/trunk/xmoto/debian/patches/desktop.patch
packages/trunk/xmoto/debian/patches/fix_segfault.patch
packages/trunk/xmoto/debian/patches/series
Modified:
packages/trunk/xmoto/debian/changelog
packages/trunk/xmoto/debian/control
Log:
Fix #492414 and #478974
Minor changes in control
Modified: packages/trunk/xmoto/debian/changelog
===================================================================
--- packages/trunk/xmoto/debian/changelog 2008-08-26 20:55:44 UTC (rev 7996)
+++ packages/trunk/xmoto/debian/changelog 2008-08-26 20:57:38 UTC (rev 7997)
@@ -1,3 +1,16 @@
+xmoto (0.4.2-2) UNRELEASED; urgency=low
+
+ [ Miriam Ruiz ]
+ * Upgraded Standards-Version to 3.8.0. No changes needed.
+ * Don't call atoi(NULL), fixes segfault on upgrade from etch
+ (Closes: #492414). Thanks to Julien Cristau <jcristau at debian.org>
+ * Added Homepage field to debian/control
+ * Added Suggests: xmoto to package xmoto-data
+ * Added ArcadeGame to desktop categories. Closes: #478974
+ Thanks to Daniel Dickinson <cshore at wightman.ca>
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Tue, 26 Aug 2008 21:42:52 +0200
+
xmoto (0.4.2-1) unstable; urgency=low
* New upstream release.
Modified: packages/trunk/xmoto/debian/control
===================================================================
--- packages/trunk/xmoto/debian/control 2008-08-26 20:55:44 UTC (rev 7996)
+++ packages/trunk/xmoto/debian/control 2008-08-26 20:57:38 UTC (rev 7997)
@@ -2,8 +2,10 @@
Section: games
Priority: optional
Maintainer: Samuel Mimram <smimram at debian.org>
+Uploaders: Miriam Ruiz <little_miry at yahoo.es>
Build-Depends: debhelper (>= 4.0.0), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libjpeg62-dev, libpng12-dev, zlib1g-dev, xlibmesa-gl-dev | libgl-dev, libode0-dev, liblua5.1-0-dev, libcurl4-gnutls-dev, libbz2-dev, libsqlite3-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
+Homepage: http://xmoto.tuxfamily.org/
Package: xmoto
Architecture: any
@@ -17,7 +19,8 @@
Package: xmoto-data
Architecture: all
-Description: 2D motocross platform game
+Suggests: xmoto (>= ${source:Version})
+Description: 2D motocross platform game - data files
X-Moto is a challenging 2D motocross platform game, where physics play
an all important role in the gameplay. You need to control your bike to
its limit, if you want to have a chance finishing the more difficult of
Added: packages/trunk/xmoto/debian/patches/desktop.patch
===================================================================
--- packages/trunk/xmoto/debian/patches/desktop.patch (rev 0)
+++ packages/trunk/xmoto/debian/patches/desktop.patch 2008-08-26 20:57:38 UTC (rev 7997)
@@ -0,0 +1,11 @@
+Index: xmoto-0.4.2/extra/xmoto.desktop
+===================================================================
+--- xmoto-0.4.2.orig/extra/xmoto.desktop 2008-08-26 22:41:45.000000000 +0200
++++ xmoto-0.4.2/extra/xmoto.desktop 2008-08-26 22:42:11.000000000 +0200
+@@ -6,4 +6,5 @@
+ GenericName[fr_FR]=Jeu de moto
+ Icon=xmoto.xpm
+ Exec=xmoto
+-Categories=Game;SportsGame;
++Categories=Game;SportsGame;ArcadeGame;
++
Added: packages/trunk/xmoto/debian/patches/fix_segfault.patch
===================================================================
--- packages/trunk/xmoto/debian/patches/fix_segfault.patch (rev 0)
+++ packages/trunk/xmoto/debian/patches/fix_segfault.patch 2008-08-26 20:57:38 UTC (rev 7997)
@@ -0,0 +1,62 @@
+diff -u xmoto-0.4.2/debian/changelog xmoto-0.4.2/debian/changelog
+--- xmoto-0.4.2.orig/src/states/StateMainMenu.cpp
++++ xmoto-0.4.2/src/states/StateMainMenu.cpp
+@@ -673,6 +673,7 @@
+ int v_nbDiffLevels = 0;
+ std::string v_level_name= "";
+ xmDatabase* pDb = xmDatabase::instance("main");
++ char *tmpresult;
+
+ if(v_window != NULL){
+ delete v_window;
+@@ -695,14 +696,21 @@
+ return;
+ }
+
+- v_nbStarts = atoi(pDb->getResult(v_result, 8, 0, 0));
++ tmpresult = pDb->getResult(v_result, 8, 0, 0);
++ v_nbStarts = tmpresult ? atoi(tmpresult) : 0;
+ v_since = pDb->getResult(v_result, 8, 0, 1);
+- v_totalPlayedTime = atoi(pDb->getResult(v_result, 8, 0, 2));
+- v_nbPlayed = atoi(pDb->getResult(v_result, 8, 0, 3));
+- v_nbDied = atoi(pDb->getResult(v_result, 8, 0, 4));
+- v_nbCompleted = atoi(pDb->getResult(v_result, 8, 0, 5));
+- v_nbRestarted = atoi(pDb->getResult(v_result, 8, 0, 6));
+- v_nbDiffLevels = atoi(pDb->getResult(v_result, 8, 0, 7));
++ tmpresult = pDb->getResult(v_result, 8, 0, 2);
++ v_totalPlayedTime = tmpresult ? atoi(tmpresult) : 0;
++ tmpresult = pDb->getResult(v_result, 8, 0, 3);
++ v_nbPlayed = tmpresult ? atoi(tmpresult) : 0;
++ tmpresult = pDb->getResult(v_result, 8, 0, 4);
++ v_nbDied = tmpresult ? atoi(tmpresult) : 0;
++ tmpresult = pDb->getResult(v_result, 8, 0, 5);
++ v_nbCompleted = tmpresult ? atoi(tmpresult) : 0;
++ tmpresult = pDb->getResult(v_result, 8, 0, 6);
++ v_nbRestarted = tmpresult ? atoi(tmpresult) : 0;
++ tmpresult = pDb->getResult(v_result, 8, 0, 7);
++ v_nbDiffLevels = tmpresult ? atoi(tmpresult) : 0;
+
+ pDb->read_DB_free(v_result);
+
+@@ -754,11 +762,16 @@
+ if(cy + 45 > nHeight) break; /* out of window */
+
+ v_level_name = pDb->getResult(v_result, 6, i, 0);
+- v_totalPlayedTime = atoi(pDb->getResult(v_result, 6, i, 5));
+- v_nbDied = atoi(pDb->getResult(v_result, 6, i, 2));
+- v_nbPlayed = atoi(pDb->getResult(v_result, 6, i, 1));
+- v_nbCompleted = atoi(pDb->getResult(v_result, 6, i, 3));
+- v_nbRestarted = atoi(pDb->getResult(v_result, 6, i, 4));
++ tmpresult = pDb->getResult(v_result, 6, i, 5);
++ v_totalPlayedTime = tmpresult ? atoi(tmpresult) : 0;
++ tmpresult = pDb->getResult(v_result, 6, i, 2);
++ v_nbDied = tmpresult ? atoi(tmpresult) : 0;
++ tmpresult = pDb->getResult(v_result, 6, i, 1);
++ v_nbPlayed = tmpresult ? atoi(tmpresult) : 0;
++ tmpresult = pDb->getResult(v_result, 6, i, 3);
++ v_nbCompleted = tmpresult ? atoi(tmpresult) : 0;
++ tmpresult = pDb->getResult(v_result, 6, i, 4);
++ v_nbRestarted = tmpresult ? atoi(tmpresult) : 0;
+
+ snprintf(cBuf, 512, ("[%s] %s:\n " + std::string(GAMETEXT_XMOTOLEVELSTATS_PLAYS(v_nbPlayed) + std::string(", ") +
+ GAMETEXT_XMOTOLEVELSTATS_DEATHS(v_nbDied) + std::string(", ") +
Added: packages/trunk/xmoto/debian/patches/series
===================================================================
--- packages/trunk/xmoto/debian/patches/series (rev 0)
+++ packages/trunk/xmoto/debian/patches/series 2008-08-26 20:57:38 UTC (rev 7997)
@@ -0,0 +1,2 @@
+fix_segfault.patch
+desktop.patch
More information about the Pkg-games-commits
mailing list