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

Stephen Kitt steve-guest at alioth.debian.org
Sun Apr 22 12:21:25 UTC 2012 

Author: steve-guest
Date: 2012-04-22 12:21:25 +0000 (Sun, 22 Apr 2012)
New Revision: 13502

Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/patches/desktop.patch
   packages/trunk/xmoto/debian/patches/fix_segfault.patch
   packages/trunk/xmoto/debian/patches/manpage.patch
   packages/trunk/xmoto/debian/patches/spelling.patch
Log:
Refresh and forward all appropriate patches.

Modified: packages/trunk/xmoto/debian/changelog
===================================================================
--- packages/trunk/xmoto/debian/changelog	2012-04-22 11:02:09 UTC (rev 13501)
+++ packages/trunk/xmoto/debian/changelog	2012-04-22 12:21:25 UTC (rev 13502)
@@ -6,8 +6,11 @@
     + uses DejaVuSansMono (add link and make ttf-dejavu-core a dependency
       of xmoto-data).
   * Update patches:
-    + fix_segfault.patch: refresh, add DEP-3 header;
-    + desktop.patch: re-apply, add German translation (closes: #641822).
+    + fix_segfault.patch: refresh, add DEP-3 header, forward upstream;
+    + desktop.patch: re-apply, add German translation (closes: #641822),
+      forward upstream;
+    + spelling.patch: refresh, forward upstream;
+    + manpage.patch: forward upstream.
   * Switch to dh 9 with simple rules.
   * Use source format "3.0 (quilt)".
   * Add ${misc:Depends} where appropriate.
@@ -25,7 +28,7 @@
     (closes: #667422; thanks to Cyril Brulebois for his patch for another
     gcc-4.7-related issue, which was already included upstream).
 
- -- Stephen Kitt <steve at sk2.org>  Tue, 17 Apr 2012 08:18:03 +0200
+ -- Stephen Kitt <steve at sk2.org>  Sun, 22 Apr 2012 14:20:08 +0200
 
 xmoto (0.5.5-1) unstable; urgency=low
 

Modified: packages/trunk/xmoto/debian/patches/desktop.patch
===================================================================
--- packages/trunk/xmoto/debian/patches/desktop.patch	2012-04-22 11:02:09 UTC (rev 13501)
+++ packages/trunk/xmoto/debian/patches/desktop.patch	2012-04-22 12:21:25 UTC (rev 13502)
@@ -1,6 +1,7 @@
 Description: Add "arcade" sub-menu, and German translation
 Origin: other, http://bugs.debian.org/478974
 Origin: other, http://bugs.debian.org/641822
+Bug: http://todo.xmoto.tuxfamily.org/index.php?do=details&task_id=802
 
 --- xmoto-0.5.9.orig/extra/xmoto.desktop
 +++ xmoto-0.5.9/extra/xmoto.desktop

Modified: packages/trunk/xmoto/debian/patches/fix_segfault.patch
===================================================================
--- packages/trunk/xmoto/debian/patches/fix_segfault.patch	2012-04-22 11:02:09 UTC (rev 13501)
+++ packages/trunk/xmoto/debian/patches/fix_segfault.patch	2012-04-22 12:21:25 UTC (rev 13502)
@@ -1,6 +1,7 @@
 Description: Avoid segfaulting on NULL values in the database
 Author: Gustavo Noronha Silva <kov at debian.org>
 Origin: other, http://bugs.debian.org/492414
+Bug: http://todo.xmoto.tuxfamily.org/index.php?do=details&task_id=799
 
 --- xmoto-0.5.9.orig/src/states/StateMainMenu.cpp
 +++ xmoto-0.5.9/src/states/StateMainMenu.cpp

Modified: packages/trunk/xmoto/debian/patches/manpage.patch
===================================================================
--- packages/trunk/xmoto/debian/patches/manpage.patch	2012-04-22 11:02:09 UTC (rev 13501)
+++ packages/trunk/xmoto/debian/patches/manpage.patch	2012-04-22 12:21:25 UTC (rev 13502)
@@ -1,5 +1,6 @@
 Description: Fix hyphens and some spelling mistakes
 Author: Stephen Kitt <steve at sk2.org>
+Bug: http://todo.xmoto.tuxfamily.org/index.php?do=details&task_id=801
 
 --- xmoto-0.5.9.orig/xmoto.6
 +++ xmoto-0.5.9/xmoto.6

Modified: packages/trunk/xmoto/debian/patches/spelling.patch
===================================================================
--- packages/trunk/xmoto/debian/patches/spelling.patch	2012-04-22 11:02:09 UTC (rev 13501)
+++ packages/trunk/xmoto/debian/patches/spelling.patch	2012-04-22 12:21:25 UTC (rev 13502)
@@ -1,8 +1,9 @@
 Description: Fix a number of spelling mistakes
 Author: Stephen Kitt <steve at sk2.org>
+Bug: http://todo.xmoto.tuxfamily.org/index.php?do=details&task_id=801
 
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/ChangeLog
-+++ xmoto-0.5.9.obsolete.0.892401299745874/ChangeLog
+--- xmoto-0.5.9.orig/ChangeLog
++++ xmoto-0.5.9/ChangeLog
 @@ -125,7 +125,7 @@
   * synchronisation of the database with the webserver to share it among the places you play X-Moto
   * chipmunk integration. Blocks reacts to physics, joints and scripts calls (require special levels) - replay saving still unsupported
@@ -12,8 +13,8 @@
   * --defaultTheme option to change the default theme for new profiles (and --with-default-theme= at compilation time) ; so that packager can change it.
   * optimisations for particles handling
   * joystick support improved
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/po/lt_LT.po
-+++ xmoto-0.5.9.obsolete.0.892401299745874/po/lt_LT.po
+--- xmoto-0.5.9.orig/po/lt_LT.po
++++ xmoto-0.5.9/po/lt_LT.po
 @@ -3693,7 +3693,7 @@
  #~ msgid ""
  #~ "X-Moto uses a database on your computer to save all your scores and "
@@ -23,8 +24,8 @@
  #~ "different places."
  #~ msgstr ""
  #~ "X-Moto naudoja jūsų kompiuteryje duomenų bazę, kad išsaugotų visus jūsų "
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/po/nl_NL.po
-+++ xmoto-0.5.9.obsolete.0.892401299745874/po/nl_NL.po
+--- xmoto-0.5.9.orig/po/nl_NL.po
++++ xmoto-0.5.9/po/nl_NL.po
 @@ -3636,7 +3636,7 @@
  #~ msgid ""
  #~ "X-Moto uses a database on your computer to save all your scores and "
@@ -34,8 +35,8 @@
  #~ "different places."
  #~ msgstr ""
  #~ "X-Moto gebruikt een lokale database om je scores in op te slaan. Deze "
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/po/zh_TW.po
-+++ xmoto-0.5.9.obsolete.0.892401299745874/po/zh_TW.po
+--- xmoto-0.5.9.orig/po/zh_TW.po
++++ xmoto-0.5.9/po/zh_TW.po
 @@ -3587,7 +3587,7 @@
  #~ msgid ""
  #~ "X-Moto uses a database on your computer to save all your scores and "
@@ -45,8 +46,8 @@
  #~ "different places."
  #~ msgstr ""
  #~ "X-Moto在您的電腦裡增設了一個資料庫來儲存你 所有的紀錄與統計。你可以用你的"
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/Packager.cpp
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/Packager.cpp
+--- xmoto-0.5.9.orig/src/Packager.cpp
++++ xmoto-0.5.9/src/Packager.cpp
 @@ -74,7 +74,7 @@
  	md5sumLen = fgetc(fp);
  	fread(md5sum,md5sumLen,1,fp);
@@ -56,8 +57,8 @@
  
          int nNameLen;
          while((nNameLen=fgetc(fp)) >= 0) {  
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/Renderer.cpp
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/Renderer.cpp
+--- xmoto-0.5.9.orig/src/Renderer.cpp
++++ xmoto-0.5.9/src/Renderer.cpp
 @@ -861,7 +861,7 @@
        lines_drawn++;
        v_last_size=fSize;
@@ -67,8 +68,8 @@
    if( XMSession::instance()->debug() ) {
      std::stringstream out; out << lines_drawn;
      std::stringstream out2; out2 << v_cZoom;
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/XMArgs.cpp
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/XMArgs.cpp
+--- xmoto-0.5.9.orig/src/XMArgs.cpp
++++ xmoto-0.5.9/src/XMArgs.cpp
 @@ -691,7 +691,7 @@
    printf("\t--videoRecordingFramerate FRAMERATE\n\t\tChange video framerate.\n");
    printf("\t--videoRecordingStartTime NBCENTSOFSECONDS\n\t\tStart recording video after this game time.\n");
@@ -78,8 +79,8 @@
    printf("\t--drawlib DRAWLIB\n\t\tChoose the render to use (default one is OPENGL if available).\n");
    printf("\t--defaultTheme THEME\n\t\tDefault theme for new profiles created.\n");
    printf("\t--noDBDirsCheck\n\t\tDon't check that system and user dirs changed at startup.\n");
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/chipmunk/cpSpace.h
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/chipmunk/cpSpace.h
+--- xmoto-0.5.9.orig/src/chipmunk/cpSpace.h
++++ xmoto-0.5.9/src/chipmunk/cpSpace.h
 @@ -128,7 +128,7 @@
  static inline int
  queryFunc(void *p1, void *p2, void *data)
@@ -89,8 +90,8 @@
  	cpShape *a = (cpShape *)p1;
  	cpShape *b = (cpShape *)p2;
  	cpSpace *space = (cpSpace *)data;
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/states/GameState.h
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/states/GameState.h
+--- xmoto-0.5.9.orig/src/states/GameState.h
++++ xmoto-0.5.9/src/states/GameState.h
 @@ -89,7 +89,7 @@
      m_updatePeriod = (float)m_maxFps / (float)m_updateFps;
    }
@@ -100,8 +101,8 @@
    void setStateId(const std::string& i_id);
    std::string getStateId() const;
  
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/VTexture.cpp
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/VTexture.cpp
+--- xmoto-0.5.9.orig/src/VTexture.cpp
++++ xmoto-0.5.9/src/VTexture.cpp
 @@ -377,7 +377,7 @@
        int i=1;
        while(it != textures.end()){
@@ -129,8 +130,8 @@
  	for(unsigned int i=0; i<(*it)->curRegistrationStage.size(); i++) {
  	  LogDebug("  end %s %d [%x]", (*it)->Name.c_str(), (*it)->curRegistrationStage[i], (*it));
  	}
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/VTexture.h
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/VTexture.h
+--- xmoto-0.5.9.orig/src/VTexture.h
++++ xmoto-0.5.9/src/VTexture.h
 @@ -51,9 +51,9 @@
  //and nID is not a openGL specific structure
  //it's
@@ -152,8 +153,8 @@
    }
  
    std::string    Name;
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/GameText.h
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/GameText.h
+--- xmoto-0.5.9.orig/src/GameText.h
++++ xmoto-0.5.9/src/GameText.h
 @@ -379,7 +379,7 @@
  #define GAMETEXT_MAIN                 _("Main")
  #define GAMETEXT_MOUSE                _("Mouse")
@@ -163,9 +164,8 @@
  #define GAMETEXT_MEDAL_BRONZE         _("Bronze")
  #define GAMETEXT_MEDAL_GOLD           _("Gold")
  #define GAMETEXT_MEDAL_SILVER         _("Silver")
-Binary files xmoto-0.5.9.obsolete.0.892401299745874.orig/bin/xmoto.bin and xmoto-0.5.9.obsolete.0.892401299745874/bin/xmoto.bin differ
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/GameInit.cpp
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/GameInit.cpp
+--- xmoto-0.5.9.orig/src/GameInit.cpp
++++ xmoto-0.5.9/src/GameInit.cpp
 @@ -386,7 +386,7 @@
    v_xmArgs.isOptReplay()    ||
    v_xmArgs.isOptDemo());
@@ -175,8 +175,8 @@
    if(v_useGraphics) {
      InputHandler::instance()->init(m_userConfig, pDb, XMSession::instance()->profile(), XMSession::instance()->enableJoysticks());
    }
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/LevelsManager.cpp
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/LevelsManager.cpp
+--- xmoto-0.5.9.orig/src/LevelsManager.cpp
++++ xmoto-0.5.9/src/LevelsManager.cpp
 @@ -1531,7 +1531,7 @@
      v_tables += "         AND g.id_profile = h.id_profile)";
    }
@@ -186,8 +186,8 @@
    // highscore driver 1/2
    if(i_setHighscoreDriver != lprv_dontcare || i_limitToLastHighscores != 0) {
      if(v_mustBeInWebHighscores) {
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/db/xmDatabase_sync.cpp
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/db/xmDatabase_sync.cpp
+--- xmoto-0.5.9.orig/src/db/xmDatabase_sync.cpp
++++ xmoto-0.5.9/src/db/xmDatabase_sync.cpp
 @@ -57,7 +57,7 @@
  		      "WHERE sitekey=\"" + protectString(i_sitekey) + "\" AND id_profile=\"" + protectString(i_profile) + "\";", nrow);
      if(nrow != 1) {
@@ -197,8 +197,8 @@
      }
  
      snprintf(v_line, 2048,
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/db/xmDatabase_web.cpp
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/db/xmDatabase_web.cpp
+--- xmoto-0.5.9.orig/src/db/xmDatabase_web.cpp
++++ xmoto-0.5.9/src/db/xmDatabase_web.cpp
 @@ -67,7 +67,7 @@
        throw Exception("unable to analyze xml highscore file");
      }
@@ -217,8 +217,8 @@
        v_difficulty = XMLDocument::getOption(pSubElem, "web_difficulty");
        if(v_difficulty == "")
  	continue;
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/net/NetClient.cpp
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/net/NetClient.cpp
+--- xmoto-0.5.9.orig/src/net/NetClient.cpp
++++ xmoto-0.5.9/src/net/NetClient.cpp
 @@ -215,7 +215,7 @@
      throw Exception("Already connected");
    }
@@ -228,8 +228,8 @@
    m_serverReceivesUdp = false;
    m_serverSendsUdp    =  false;
  
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/states/StateManager.cpp
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/states/StateManager.cpp
+--- xmoto-0.5.9.orig/src/states/StateManager.cpp
++++ xmoto-0.5.9/src/states/StateManager.cpp
 @@ -905,7 +905,7 @@
  void
  StateManager::registerAsEmitter(std::string message)
@@ -239,8 +239,8 @@
    return registerAsObserver(message, NULL);
  }
  
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/states/StateManager.h
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/states/StateManager.h
+--- xmoto-0.5.9.orig/src/states/StateManager.h
++++ xmoto-0.5.9/src/states/StateManager.h
 @@ -73,7 +73,7 @@
    // yourself as an observer of this message
    void registerAsObserver(std::string message,   GameState* self);
@@ -250,8 +250,8 @@
    void registerAsEmitter(std::string message);
  
    // send the message to registered states
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/states/StateReplaying.cpp
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/states/StateReplaying.cpp
+--- xmoto-0.5.9.orig/src/states/StateReplaying.cpp
++++ xmoto-0.5.9/src/states/StateReplaying.cpp
 @@ -75,7 +75,7 @@
  
    try {
@@ -261,8 +261,8 @@
        char c_tmp[1024];
        snprintf(c_tmp, 1024,
  	       GAMETEXT_BY_PLAYER,
---- xmoto-0.5.9.obsolete.0.892401299745874.orig/src/states/StateUpdate.cpp
-+++ xmoto-0.5.9.obsolete.0.892401299745874/src/states/StateUpdate.cpp
+--- xmoto-0.5.9.orig/src/states/StateUpdate.cpp
++++ xmoto-0.5.9/src/states/StateUpdate.cpp
 @@ -116,7 +116,7 @@
    }

More information about the Pkg-games-commits mailing list