Control: tags 759067 + patch

I've rebuilt rurple-ng with the attached patch and it seems to work.

The only issue I saw was that "Help->About" does nothing in the GUI,
but if run from a terminal you get this:

Traceback (most recent call last):
  File "/usr/share/rurple-ng/rurple/ui.py", line 460, in OnAbout
    with open(share.path("COPYING.txt")) as f:
IOError: [Errno 2] No such file or directory: 
u'/usr/share/rurple-ng/share/COPYING.txt'

However the same is true of the package in unstable currently, so
this seems to be orthogonal to the wxPython transition.

Happy to NMU this change - just say if you'd like me to.

Cheers,
    Olly
diff -Nru rurple-ng-0.5+16/debian/changelog rurple-ng-0.5+16/debian/changelog
--- rurple-ng-0.5+16/debian/changelog	2013-10-09 13:18:00.000000000 -0300
+++ rurple-ng-0.5+16/debian/changelog	2014-09-10 21:10:44.000000000 -0300
@@ -1,3 +1,11 @@
+rurple-ng (0.5+16-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update for wxPython 3.0 (Closes: #759067):
+    + New patch: wxpython3.0.patch
+
+ -- Olly Betts <o...@survex.com>  Thu, 11 Sep 2014 00:10:22 +0000
+
 rurple-ng (0.5+16-1) unstable; urgency=low
 
   * Initial release. (Closes: #693069)
diff -Nru rurple-ng-0.5+16/debian/control rurple-ng-0.5+16/debian/control
--- rurple-ng-0.5+16/debian/control	2013-10-09 15:00:07.000000000 -0300
+++ rurple-ng-0.5+16/debian/control	2014-09-10 21:08:27.000000000 -0300
@@ -8,7 +8,7 @@
 
 Package: rurple-ng
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk2.8
+Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk3.0
 Description: learn programming in Python with a robot
  Rurple-ng is a rewrite of RUR-PLE[1], a programming learning environment. The
  student learns programming concepts by controling a robot. The original
diff -Nru rurple-ng-0.5+16/debian/patches/series rurple-ng-0.5+16/debian/patches/series
--- rurple-ng-0.5+16/debian/patches/series	1969-12-31 21:00:00.000000000 -0300
+++ rurple-ng-0.5+16/debian/patches/series	2014-09-10 21:09:31.000000000 -0300
@@ -0,0 +1 @@
+wxpython3.0.patch
diff -Nru rurple-ng-0.5+16/debian/patches/wxpython3.0.patch rurple-ng-0.5+16/debian/patches/wxpython3.0.patch
--- rurple-ng-0.5+16/debian/patches/wxpython3.0.patch	1969-12-31 21:00:00.000000000 -0300
+++ rurple-ng-0.5+16/debian/patches/wxpython3.0.patch	2014-09-10 21:10:16.000000000 -0300
@@ -0,0 +1,35 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Bug-Debian: https://bugs.debian.org/759067
+Forwarded: no
+Last-Update: 2014-09-10
+
+--- rurple-ng-0.5+16.orig/rurple/ui.py
++++ rurple-ng-0.5+16/rurple/ui.py
+@@ -137,7 +137,7 @@ class Openable(object):
+         dlg = wx.FileDialog(self._ui,
+             message="Open %s..." % self._type,
+             wildcard=self._wildcard,
+-            style = wx.OPEN | wx.CHANGE_DIR)
++            style = wx.FD_OPEN | wx.FD_CHANGE_DIR)
+         if dlg.ShowModal() != wx.ID_OK:
+             return
+         path = self._suffixPath(dlg.GetPath())
+@@ -157,7 +157,7 @@ class Openable(object):
+         dlg = wx.FileDialog(self._ui,
+             message="Open sample %s..." % self._type,
+             wildcard=self._wildcard,
+-            defaultDir = share.path(self._type + "s"), style = wx.OPEN)
++            defaultDir = share.path(self._type + "s"), style = wx.FD_OPEN)
+         if dlg.ShowModal() != wx.ID_OK:
+             return
+         path = self._suffixPath(dlg.GetPath())
+@@ -183,7 +183,7 @@ class Openable(object):
+         dlg = wx.FileDialog(self._ui,
+             message="Save %s as..." % self._type,
+             wildcard=self._wildcard,
+-            style = wx.SAVE | wx.CHANGE_DIR)
++            style = wx.FD_SAVE | wx.FD_CHANGE_DIR)
+         if dlg.ShowModal() != wx.ID_OK:
+             return False
+         path = self._suffixPath(dlg.GetPath())

Reply via email to