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

[Eddy Petrisor]

Author: eddyp-guest
Date: 2006-11-15 13:38:18 +0100 (Wed, 15 Nov 2006)
New Revision: 1987

Removed:
   packages/trunk/wormux/debian/patches/001_dont_crash_if_default_resolution_is_unavailable_just-for-0.7.4.patch
Modified:
   packages/trunk/wormux/debian/changelog
Log:
dropped the 0.7.4 specific patch for the resolution problem

Modified: packages/trunk/wormux/debian/changelog
===================================================================
--- packages/trunk/wormux/debian/changelog	2006-11-14 20:22:15 UTC (rev 1986)
+++ packages/trunk/wormux/debian/changelog	2006-11-15 12:38:18 UTC (rev 1987)
@@ -6,8 +6,9 @@
   [ Eddy Petrișor ]
   * correct my name also in the control.in file
   * add patchutils as a build dependency in the control.in file, too
+  * dropped the patch for resolution problem since it was 0.7.4 specific
 
- -- Eddy Petrișor <eddy.petrisor at gmail.com>  Tue, 14 Nov 2006 21:36:36 +0200
+ -- Eddy Petrișor <eddy.petrisor at gmail.com>  Wed, 15 Nov 2006 14:37:22 +0200
 
 wormux (0.7.4-2) unstable; urgency=medium
 

Deleted: packages/trunk/wormux/debian/patches/001_dont_crash_if_default_resolution_is_unavailable_just-for-0.7.4.patch
===================================================================
--- packages/trunk/wormux/debian/patches/001_dont_crash_if_default_resolution_is_unavailable_just-for-0.7.4.patch	2006-11-14 20:22:15 UTC (rev 1986)
+++ packages/trunk/wormux/debian/patches/001_dont_crash_if_default_resolution_is_unavailable_just-for-0.7.4.patch	2006-11-15 12:38:18 UTC (rev 1987)
@@ -1,34 +0,0 @@
---- wormux-0.7.4/src/menu/options_menu.cpp	2006-08-16 00:29:30.000000000 +0300
-+++ wormux-0.7.4-new/src/menu/options_menu.cpp	2006-11-12 16:31:07.000000000 +0200
-@@ -132,20 +132,18 @@
-   /* Check is there are any modes available */
-   AppWormux * app = AppWormux::GetInstance();
- 
--  if(modes == (SDL_Rect **)0){
-+  std::ostringstream ss,ss2;
-+  ss << app->video.window.GetWidth() << "x" << app->video.window.GetHeight();
-+  ss2 << app->video.window.GetWidth() << "x" << app->video.window.GetHeight() << " *";
-+  lbox_video_mode->AddItem(true, ss2.str(), ss.str());
-+
-+  for(int i=0;modes[i];++i) {
-+    if (modes[i]->w < 800 || modes[i]->h < 600) continue;
-+    if (modes[i]->w == app->video.window.GetWidth() &&
-+        modes[i]->h == app->video.window.GetHeight()) continue;
-     std::ostringstream ss;
--    ss << app->video.window.GetWidth() << "x" << app->video.window.GetHeight();
--    lbox_video_mode->AddItem(false, "No modes available!", ss.str());
--  } else {
--    for(int i=0;modes[i];++i) {
--      if (modes[i]->w < 800 || modes[i]->h < 600) break;
--      std::ostringstream ss;
--      ss << modes[i]->w << "x" << modes[i]->h ;
--      if (modes[i]->w == app->video.window.GetWidth() && modes[i]->h == app->video.window.GetHeight())
--	lbox_video_mode->AddItem(true, ss.str(), ss.str());
--      else
--	lbox_video_mode->AddItem(false, ss.str(), ss.str());
--    }
-+    ss << modes[i]->w << "x" << modes[i]->h ;
-+    lbox_video_mode->AddItem(false, ss.str(), ss.str());
-   }
- 
-   // Generate sound mode list