r12779 - in packages/trunk/jugglemaster/debian: . patches

[Helmut Grohne]

Author: helmut-guest
Date: 2011-11-03 18:35:58 +0000 (Thu, 03 Nov 2011)
New Revision: 12779

Added:
   packages/trunk/jugglemaster/debian/patches/wx28-compatibility.patch
Modified:
   packages/trunk/jugglemaster/debian/changelog
   packages/trunk/jugglemaster/debian/control
   packages/trunk/jugglemaster/debian/patches/series
Log:
Fix "Error in patch 010_wx26_trans.patch" applied and tested patch from Olly Betts (Closes: #645409)

Modified: packages/trunk/jugglemaster/debian/changelog
===================================================================
--- packages/trunk/jugglemaster/debian/changelog	2011-11-03 18:17:57 UTC (rev 12778)
+++ packages/trunk/jugglemaster/debian/changelog	2011-11-03 18:35:58 UTC (rev 12779)
@@ -5,8 +5,10 @@
   * Bumped Standards-Version to 3.9.2, no changes needed.
   * Fix "Error in patch 010_wx26_trans.patch" updated patch, thanks to
     Olly Betts (Closes: #645409)
+  * Fix "Error in patch 010_wx26_trans.patch" applied and tested patch from
+    Olly Betts (Closes: #645409)
 
- -- Helmut Grohne <helmut at subdivi.de>  Thu, 03 Nov 2011 17:59:41 +0100
+ -- Helmut Grohne <helmut at subdivi.de>  Thu, 03 Nov 2011 19:34:38 +0100
 
 jugglemaster (0.4-5) unstable; urgency=low
 

Modified: packages/trunk/jugglemaster/debian/control
===================================================================
--- packages/trunk/jugglemaster/debian/control	2011-11-03 18:17:57 UTC (rev 12778)
+++ packages/trunk/jugglemaster/debian/control	2011-11-03 18:35:58 UTC (rev 12779)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7.0.50~),
  libaa1-dev,
  libavcodec-dev,
- libwxgtk2.6-dev
+ libwxgtk2.8-dev
 Standards-Version: 3.9.2
 Homepage: http://icculus.org/jugglemaster/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/jugglemaster/

Modified: packages/trunk/jugglemaster/debian/patches/series
===================================================================
--- packages/trunk/jugglemaster/debian/patches/series	2011-11-03 18:17:57 UTC (rev 12778)
+++ packages/trunk/jugglemaster/debian/patches/series	2011-11-03 18:35:58 UTC (rev 12779)
@@ -7,3 +7,4 @@
 wx26_trans_ffmpeg.patch
 fix-style-rendering.patch
 fix-memory-zeroing.patch
+wx28-compatibility.patch

Added: packages/trunk/jugglemaster/debian/patches/wx28-compatibility.patch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/wx28-compatibility.patch	                        (rev 0)
+++ packages/trunk/jugglemaster/debian/patches/wx28-compatibility.patch	2011-11-03 18:35:58 UTC (rev 12779)
@@ -0,0 +1,20 @@
+Description: Fixes for wxwidgets2.8 compatibility
+ Should still be compatible with xwidgets2.6.
+Author: Olly Betts <olly at survex.com>
+
+---
+Bug-Debian: http://bugs.debian.org/645408
+Forwarded: no
+Last-Update: 2011-10-15
+
+--- jugglemaster-0.4.orig/src/jmdlx/jmdlx.h
++++ jugglemaster-0.4/src/jmdlx/jmdlx.h
+@@ -43,7 +43,7 @@ public:
+ private:
+   JMFrame* parent;
+   JMLib* jmlib;
+-  wxBrush* ball_colors[NUMBALLCOLORS];
++  const wxBrush* ball_colors[NUMBALLCOLORS];
+ 
+   DECLARE_EVENT_TABLE()
+ };