Dear maintainer,

I've uploaded an NMU for python-wxmpl (versioned as 2.0.0-2.1).

This is the same as the most recent patch I sent, but with the
debian/changelog entry date updated.

Cheers,
    Olly
diff -Nru python-wxmpl-2.0.0/debian/changelog python-wxmpl-2.0.0/debian/changelog
--- python-wxmpl-2.0.0/debian/changelog	2011-12-05 17:58:28.000000000 +1300
+++ python-wxmpl-2.0.0/debian/changelog	2014-09-19 20:24:38.000000000 +1200
@@ -1,3 +1,11 @@
+python-wxmpl (2.0.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update for wxPython 3.0 (Closes: #759046):
+    + New patch: wxpython3.0.patch
+
+ -- Olly Betts <o...@survex.com>  Fri, 19 Sep 2014 08:24:23 +0000
+
 python-wxmpl (2.0.0-2) unstable; urgency=low
 
   * Remove dependency on python-wxgtk2.6 which is removed from sid
diff -Nru python-wxmpl-2.0.0/debian/control python-wxmpl-2.0.0/debian/control
--- python-wxmpl-2.0.0/debian/control	2011-10-21 20:23:42.000000000 +1300
+++ python-wxmpl-2.0.0/debian/control	2014-09-06 15:20:13.000000000 +1200
@@ -10,7 +10,7 @@
 Package: python-wxmpl
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-matplotlib (>> 0.72),
-         python-wxgtk2.8
+         python-wxgtk3.0
 Provides: ${python:Provides}
 Homepage: http://csrri.iit.edu/~wxmpl/
 Description: Painless matplotlib embedding in wxPython
diff -Nru python-wxmpl-2.0.0/debian/patches/series python-wxmpl-2.0.0/debian/patches/series
--- python-wxmpl-2.0.0/debian/patches/series	1970-01-01 12:00:00.000000000 +1200
+++ python-wxmpl-2.0.0/debian/patches/series	2014-09-06 15:21:50.000000000 +1200
@@ -0,0 +1 @@
+wxpython3.0.patch
diff -Nru python-wxmpl-2.0.0/debian/patches/wxpython3.0.patch python-wxmpl-2.0.0/debian/patches/wxpython3.0.patch
--- python-wxmpl-2.0.0/debian/patches/wxpython3.0.patch	1970-01-01 12:00:00.000000000 +1200
+++ python-wxmpl-2.0.0/debian/patches/wxpython3.0.patch	2014-09-13 15:01:14.000000000 +1200
@@ -0,0 +1,42 @@
+Description: Update for wxPython 3.0
+ Should retain compatibility with 2.8.
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: https://bugs.debian.org/759046
+Forwarded: no
+Last-Update: 2014-09-12
+
+Index: python-wxmpl-2.0.0/demos/plotting.py
+===================================================================
+--- python-wxmpl-2.0.0.orig/demos/plotting.py
++++ python-wxmpl-2.0.0/demos/plotting.py
+@@ -337,7 +337,7 @@ class TestFrame(wx.Frame):
+ 
+ 
+ def main():
+-    app = wx.PySimpleApp()
++    app = wx.App(False)
+     frame = TestFrame(None, -1, 'WxMpl Demos')
+     frame.Show(True)
+     app.MainLoop()
+Index: python-wxmpl-2.0.0/lib/wxmpl.py
+===================================================================
+--- python-wxmpl-2.0.0.orig/lib/wxmpl.py
++++ python-wxmpl-2.0.0/lib/wxmpl.py
+@@ -1124,7 +1124,7 @@ class PlotPanel(FigureCanvasWxAgg):
+         # find the toplevel parent window and register an activation event
+         # handler that is keyed to the id of this PlotPanel
+         topwin = toplevel_parent_of_window(self)
+-        topwin.Connect(-1, self.GetId(), wx.wxEVT_ACTIVATE, self.OnActivate)
++        topwin.Connect(self.GetId(), -1, wx.wxEVT_ACTIVATE, self.OnActivate)
+ 
+         wx.EVT_ERASE_BACKGROUND(self, self.OnEraseBackground)
+         wx.EVT_WINDOW_DESTROY(self, self.OnDestroy)
+@@ -1422,7 +1422,7 @@ class PlotFrame(wx.Frame):
+         fileName = wx.FileSelector('Save Plot', default_extension='png',
+             wildcard=('Portable Network Graphics (*.png)|*.png|'
+                 + 'Encapsulated Postscript (*.eps)|*.eps|All files (*.*)|*.*'),
+-            parent=self, flags=wx.SAVE|wx.OVERWRITE_PROMPT)
++            parent=self, flags=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+ 
+         if not fileName:
+             return

Reply via email to