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

Stephen Kitt steve-guest at alioth.debian.org
Sun Mar 20 23:44:06 UTC 2011


Author: steve-guest
Date: 2011-03-20 23:44:05 +0000 (Sun, 20 Mar 2011)
New Revision: 11972

Removed:
   packages/trunk/xmoto/debian/patches/64bit-ftbfs.patch
Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/control
   packages/trunk/xmoto/debian/patches/fix_segfault.patch
   packages/trunk/xmoto/debian/patches/series
Log:
Update for 0.5.5.

Modified: packages/trunk/xmoto/debian/changelog
===================================================================
--- packages/trunk/xmoto/debian/changelog	2011-03-20 22:57:50 UTC (rev 11971)
+++ packages/trunk/xmoto/debian/changelog	2011-03-20 23:44:05 UTC (rev 11972)
@@ -1,3 +1,14 @@
+xmoto (0.5.5-1) UNRELEASED; urgency=low
+
+  [ Stephen Kitt ]
+  * New upstream release. (Closes: #580428.)
+  * Update patches:
+    + fix_segfault.patch: refreshed;
+    + 64bit-ftbfs.patch: removed (applied upstream).
+  * Add libxdg-basedir-dev build-dependency.
+
+ -- Stephen Kitt <steve at sk2.org>  Sun, 20 Mar 2011 23:58:44 +0100
+
 xmoto (0.5.2-2) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: packages/trunk/xmoto/debian/control
===================================================================
--- packages/trunk/xmoto/debian/control	2011-03-20 22:57:50 UTC (rev 11971)
+++ packages/trunk/xmoto/debian/control	2011-03-20 23:44:05 UTC (rev 11972)
@@ -7,7 +7,8 @@
 Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.19), autotools-dev, quilt,
  libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev,
  libjpeg62-dev, libpng12-dev, zlib1g-dev, libgl1-mesa-dev | libgl-dev,
- libode-dev, liblua5.1-0-dev, libcurl4-gnutls-dev, libbz2-dev, libsqlite3-dev
+ libode-dev, liblua5.1-0-dev, libcurl4-gnutls-dev, libbz2-dev, libsqlite3-dev,
+ libxdg-basedir-dev
 Standards-Version: 3.8.3
 Homepage: http://xmoto.tuxfamily.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/xmoto/?op=log

Deleted: packages/trunk/xmoto/debian/patches/64bit-ftbfs.patch
===================================================================
--- packages/trunk/xmoto/debian/patches/64bit-ftbfs.patch	2011-03-20 22:57:50 UTC (rev 11971)
+++ packages/trunk/xmoto/debian/patches/64bit-ftbfs.patch	2011-03-20 23:44:05 UTC (rev 11972)
@@ -1,11 +0,0 @@
---- a/src/Replay.cpp
-+++ b/src/Replay.cpp
-@@ -156,7 +156,7 @@
-     v_replay.writeBuf(pcData, nDataSize);
-     
-     /* Chunks */
--    v_replay << m_Chunks.size();
-+    v_replay << (unsigned int)m_Chunks.size();
-     for(unsigned int i=0;i<m_Chunks.size();i++) {
-       v_replay << m_Chunks[i]->nNumStates;
-       v_replay.writeBuf(m_Chunks[i]->pcChunkData, m_nStateSize * m_Chunks[i]->nNumStates);

Modified: packages/trunk/xmoto/debian/patches/fix_segfault.patch
===================================================================
--- packages/trunk/xmoto/debian/patches/fix_segfault.patch	2011-03-20 22:57:50 UTC (rev 11971)
+++ packages/trunk/xmoto/debian/patches/fix_segfault.patch	2011-03-20 23:44:05 UTC (rev 11972)
@@ -1,8 +1,6 @@
-Index: xmoto-0.5.2/src/states/StateMainMenu.cpp
-===================================================================
---- xmoto-0.5.2.orig/src/states/StateMainMenu.cpp	2009-08-05 07:46:06.000000000 -0400
-+++ xmoto-0.5.2/src/states/StateMainMenu.cpp	2009-09-26 10:10:50.000000000 -0400
-@@ -871,6 +871,7 @@
+--- xmoto-0.5.5.orig/src/states/StateMainMenu.cpp
++++ xmoto-0.5.5/src/states/StateMainMenu.cpp
+@@ -893,6 +893,7 @@
    int   v_nbDiffLevels    = 0;
    std::string v_level_name= "";
    xmDatabase* pDb = xmDatabase::instance("main");
@@ -10,7 +8,7 @@
    
    if(v_window != NULL){
      delete v_window;
-@@ -888,7 +889,8 @@
+@@ -910,7 +911,8 @@
      pDb->read_DB_free(v_result);
      return;
    }
@@ -20,7 +18,7 @@
    v_since           =      pDb->getResult(v_result, 2, 0, 1);  
    pDb->read_DB_free(v_result);
  
-@@ -904,11 +906,16 @@
+@@ -926,11 +928,16 @@
      pDb->read_DB_free(v_result);
      return;
    }
@@ -42,17 +40,7 @@
    pDb->read_DB_free(v_result);
  
    v_result = pDb->readDB("SELECT COUNT(DISTINCT(id_level)) "
-@@ -919,7 +926,8 @@
-     pDb->read_DB_free(v_result);
-     return;
-   }  
--  v_nbDiffLevels = atoi(pDb->getResult(v_result, 1, 0, 0));
-+  tmpresult         = pDb->getResult(v_result, 1, 0, 0);
-+  v_nbDiffLevels    = tmpresult ? atoi(tmpresult) : 0;
-   pDb->read_DB_free(v_result);
- 
-   /* Per-player info */
-@@ -971,11 +979,16 @@
+@@ -993,11 +1000,16 @@
      if(cy + 45 > nHeight) break; /* out of window */
      
      v_level_name      =      pDb->getResult(v_result, 6, i, 0);

Modified: packages/trunk/xmoto/debian/patches/series
===================================================================
--- packages/trunk/xmoto/debian/patches/series	2011-03-20 22:57:50 UTC (rev 11971)
+++ packages/trunk/xmoto/debian/patches/series	2011-03-20 23:44:05 UTC (rev 11972)
@@ -1,2 +1 @@
 fix_segfault.patch
-64bit-ftbfs.patch




More information about the Pkg-games-commits mailing list