r3357 - in packages/trunk/wormux/debian: . patches

[Eddy Petrisor]

Author: eddyp-guest
Date: 2007-07-11 22:04:25 +0000 (Wed, 11 Jul 2007)
New Revision: 3357

Removed:
   packages/trunk/wormux/debian/patches/001_upstream_fix_ftbfs_with_gcc4.2.patch
Modified:
   packages/trunk/wormux/debian/
   packages/trunk/wormux/debian/changelog
Log:
new release; drop the FTBFS patch since the orig code contains it


Property changes on: packages/trunk/wormux/debian
___________________________________________________________________
Name: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/wormux_0.7.9.orig.tar.gz

   + http://pkg-games.alioth.debian.org/tarballs/wormux_0.8beta1.orig.tar.gz


Modified: packages/trunk/wormux/debian/changelog
===================================================================
--- packages/trunk/wormux/debian/changelog	2007-07-11 21:34:46 UTC (rev 3356)
+++ packages/trunk/wormux/debian/changelog	2007-07-11 22:04:25 UTC (rev 3357)
@@ -1,3 +1,10 @@
+wormux (0.8beta1-1) UNRELEASED; urgency=low
+
+  * dropped the patch for the gcc 4.2 FTBFS since it was backported from
+    upstream
+
+ -- Eddy Petrișor <eddy.petrisor at gmail.com>  Thu, 12 Jul 2007 01:02:33 +0300
+
 wormux (0.7.9-4) unstable; urgency=low
 
   * backported upstream changes wrt failure to build with GCC 4.2

Deleted: packages/trunk/wormux/debian/patches/001_upstream_fix_ftbfs_with_gcc4.2.patch
===================================================================
--- packages/trunk/wormux/debian/patches/001_upstream_fix_ftbfs_with_gcc4.2.patch	2007-07-11 21:34:46 UTC (rev 3356)
+++ packages/trunk/wormux/debian/patches/001_upstream_fix_ftbfs_with_gcc4.2.patch	2007-07-11 22:04:25 UTC (rev 3357)
@@ -1,84 +0,0 @@
-diff -Nur wormux-0.7.9/src/game/game_loop.cpp wormux-0.7.9.new/src/game/game_loop.cpp
---- wormux-0.7.9/src/game/game_loop.cpp	2007-01-28 14:03:47.000000000 +0000
-+++ wormux-0.7.9.new/src/game/game_loop.cpp	2007-05-28 21:36:15.000000000 +0000
-@@ -628,7 +628,7 @@
-   {
-     if (!character->IsImmobile() && !character->IsGhost())
-     {
--      MSG_DEBUG("game.endofturn", "%s is not ready", character->GetName().c_str())
-+      MSG_DEBUG("game.endofturn", "%s is not ready", character->GetName().c_str());
-       return &(*character);
-     }
-   }
-@@ -637,7 +637,7 @@
-   {
-     if (!(*object)->IsImmobile())
-     {
--      MSG_DEBUG("game.endofturn", "%s is moving", (*object)->GetName().c_str())
-+      MSG_DEBUG("game.endofturn", "%s is moving", (*object)->GetName().c_str());
-       return (*object);
-     }
-   }
-diff -Nur wormux-0.7.9/src/menu/credits_menu.cpp wormux-0.7.9.new/src/menu/credits_menu.cpp
---- wormux-0.7.9/src/menu/credits_menu.cpp	2007-01-28 14:03:47.000000000 +0000
-+++ wormux-0.7.9.new/src/menu/credits_menu.cpp	2007-05-28 21:36:15.000000000 +0000
-@@ -111,7 +111,7 @@
-     return;
-   }
-   // Use an array for this is the best solution I think, but there is perhaps a better code...
--  static char *teams[] = { "team", "contributors", "thanks" };
-+  static std::string teams[] = { "team", "contributors", "thanks" };
- 
-   for(uint i = 0; i < (sizeof teams / sizeof* teams); ++i)
-   {
-diff -Nur wormux-0.7.9/src/menu/menu.cpp wormux-0.7.9.new/src/menu/menu.cpp
---- wormux-0.7.9/src/menu/menu.cpp	2007-01-28 14:03:47.000000000 +0000
-+++ wormux-0.7.9.new/src/menu/menu.cpp	2007-05-28 21:36:15.000000000 +0000
-@@ -26,7 +26,7 @@
- #include "../tool/resource_manager.h"
- #include "../sound/jukebox.h"
- 
--Menu::Menu(char * bg, t_action _actions) :
-+Menu::Menu(std::string bg, t_action _actions) :
-   actions(_actions)
- {
-   close_menu = false ;
-diff -Nur wormux-0.7.9/src/menu/menu.h wormux-0.7.9.new/src/menu/menu.h
---- wormux-0.7.9/src/menu/menu.h	2007-01-28 14:03:47.000000000 +0000
-+++ wormux-0.7.9.new/src/menu/menu.h	2007-05-28 21:36:15.000000000 +0000
-@@ -52,7 +52,7 @@
-    WidgetList widgets;
-    const t_action actions;
- 
--   Menu(char* bg, t_action actions = vOkCancel); 
-+   Menu(std::string bg, t_action actions = vOkCancel);
-    virtual ~Menu();
- 
-    void Run ();
-diff -Nur wormux-0.7.9/src/tool/debug.h wormux-0.7.9.new/src/tool/debug.h
---- wormux-0.7.9/src/tool/debug.h	2007-01-28 14:03:48.000000000 +0000
-+++ wormux-0.7.9.new/src/tool/debug.h	2007-05-28 21:36:36.000000000 +0000
-@@ -33,9 +33,9 @@
-  */
- #ifdef DEBUG
- #  define MSG_DEBUG(LEVEL, MESSAGE, ARGS...) \
--	PrintDebug( __FILE__, __PRETTY_FUNCTION__, __LINE__, LEVEL, MESSAGE, ## ARGS);
-+	PrintDebug( __FILE__, __PRETTY_FUNCTION__, __LINE__, LEVEL, MESSAGE, ## ARGS)
- #else
--#  define MSG_DEBUG(LEVEL, MESSAGE, ARGS...)
-+#  define MSG_DEBUG(LEVEL, MESSAGE, ARGS...) do {} while (0)
- #endif
- 
- void PrintDebug (const char *filename, const char *function, unsigned long line,
-diff -Nur wormux-0.7.9/src/tool/resource_manager.cpp wormux-0.7.9.new/src/tool/resource_manager.cpp
---- wormux-0.7.9/src/tool/resource_manager.cpp	2007-01-28 14:03:48.000000000 +0000
-+++ wormux-0.7.9.new/src/tool/resource_manager.cpp	2007-05-28 21:36:15.000000000 +0000
-@@ -64,7 +64,7 @@
-     Error("ResourceManager: can't find color resource \""+resource_name+"\" in profile "+profile->filename);
- 
-   uint chanel_color[4];
--  char * tmp[4] = { "r", "g", "b", "a" };
-+  std::string tmp[4] = { "r", "g", "b", "a" };
-   for(int i = 0; i < 4; i++) {
-     if (!profile->doc->ReadUintAttr( elem, tmp[i], chanel_color[i]))
-       Error("ResourceManager: color resource \""+resource_name+"\" has no "+tmp[i]+" field in profile "+profile->filename);