Control: tags 759069 + patch

I've rebuilt gastables with the attached patch and done some simple
testing.

I'm not familiar with the calculations it is doing, but the UI seems
to operate correctly.

If you prefer, I'm happy to NMU these changes.

Cheers,
    Olly
diff -Nru gastables-0.3/debian/changelog gastables-0.3/debian/changelog
--- gastables-0.3/debian/changelog	2013-05-28 04:21:25.000000000 -0300
+++ gastables-0.3/debian/changelog	2014-09-10 22:23:11.000000000 -0300
@@ -1,3 +1,11 @@
+gastables (0.3-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update for wxPython 3.0 (Closes: #759069):
+    - New patch: wxpython3.0.patch
+
+ -- Olly Betts <o...@survex.com>  Thu, 11 Sep 2014 01:22:34 +0000
+
 gastables (0.3-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru gastables-0.3/debian/control gastables-0.3/debian/control
--- gastables-0.3/debian/control	2013-05-28 04:20:11.000000000 -0300
+++ gastables-0.3/debian/control	2014-09-10 22:13:49.000000000 -0300
@@ -13,7 +13,7 @@
 Package: gastables
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-gastables, python-wxgtk2.8, python-matplotlib
+ python-gastables, python-wxgtk3.0, python-matplotlib
 Description: graphical user interface for compressible flow gas table modules
  Gas Tables include modules for compressible gas flow
  calculations. The main modules currently included are:
diff -Nru gastables-0.3/debian/patches/series gastables-0.3/debian/patches/series
--- gastables-0.3/debian/patches/series	2009-11-26 18:10:04.000000000 -0300
+++ gastables-0.3/debian/patches/series	2014-09-10 22:21:49.000000000 -0300
@@ -1 +1,2 @@
 exit_menu.diff
+wxpython3.0.patch
diff -Nru gastables-0.3/debian/patches/wxpython3.0.patch gastables-0.3/debian/patches/wxpython3.0.patch
--- gastables-0.3/debian/patches/wxpython3.0.patch	1969-12-31 21:00:00.000000000 -0300
+++ gastables-0.3/debian/patches/wxpython3.0.patch	2014-09-10 22:28:06.000000000 -0300
@@ -0,0 +1,28 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Bug-Debian: https://bugs.debian.org/759069
+Forwarded: no
+Last-Update: 2014-09-10
+
+Index: gastables-0.3/gui/gastables
+===================================================================
+--- gastables-0.3.orig/gui/gastables
++++ gastables-0.3/gui/gastables
+@@ -58,7 +58,7 @@ ID_Isothermal   = wx.NewId()
+ ID_PrandtlMeyer = wx.NewId()
+ 
+ # colours used in status bar
+-RED = wx.Color(200,100,0)
++RED = wx.Colour(200,100,0)
+ 
+ class GasTables(wx.Frame):
+     def __init__(self, parent, ID, title):
+@@ -466,6 +466,8 @@ class GasTables(wx.Frame):
+ 
+ class GasTablesGUI(wx.App):
+     def OnInit(self):
++        # Suppress WXDEBUG assertions, as happens by default with wx2.8.
++        self.SetAssertMode(wx.PYAPP_ASSERT_SUPPRESS)
+         frame = GasTables(None, -1, TITLE)
+         frame.Show(True)
+         self.SetTopWindow(frame)

Reply via email to