Package: squaremap
Version: 1:1.0.4-1
Severity: important
Tags: patch sid jessie
User: [email protected]
Usertags: wxpy3.0
Control: block 755757 by -1
We're aiming to migrate the archive to using wxpython3.0 instead of
wxwidgets2.8, and hope to drop wxwidgets2.8 before jessie is released.
I've rebuilt squaremap with the attached tiny patch, which updates the
code to stop it issuing a deprecation warning with wxPython 3.0, while
retaining compatibility with wxPython 2.8.
I've also dropped the dependency on python-wxversion, as it isn't
actually used anywhere.
I've tested the library using the built in test app, and it seems to
work identically to the current package under wxPython 2.8. This is
the command line I used to test:
python /usr/lib/python2.7/dist-packages/squaremap/squaremap.py .
I'm happy to NMU these changes.
Cheers,
Olly
diff -Nru squaremap-1.0.4/debian/changelog squaremap-1.0.4/debian/changelog
--- squaremap-1.0.4/debian/changelog 2014-07-07 11:16:54.000000000 +1200
+++ squaremap-1.0.4/debian/changelog 2014-08-18 01:33:34.000000000 +1200
@@ -1,3 +1,11 @@
+squaremap (1:1.0.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to use wxPython 3.0:
+ + New patch: wxpy3.0-compat.patch
+
+ -- Olly Betts <[email protected]> Mon, 18 Aug 2014 01:32:55 +1200
+
squaremap (1:1.0.4-1) unstable; urgency=low
* New upstream release
diff -Nru squaremap-1.0.4/debian/control squaremap-1.0.4/debian/control
--- squaremap-1.0.4/debian/control 2014-07-07 11:16:54.000000000 +1200
+++ squaremap-1.0.4/debian/control 2014-08-18 01:31:09.000000000 +1200
@@ -14,10 +14,9 @@
Package: python-squaremap
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: python-wxversion
+Depends: python-wxgtk3.0
, ${python:Depends}
, ${misc:Depends}
- , python-wxgtk2.8
Provides: ${python:Provides}
Description: wxPython control to display hierarchic data as nested squares
A simple wxPython control to display hierarchic data as a recursive set of
diff -Nru squaremap-1.0.4/debian/patches/series squaremap-1.0.4/debian/patches/series
--- squaremap-1.0.4/debian/patches/series 1970-01-01 12:00:00.000000000 +1200
+++ squaremap-1.0.4/debian/patches/series 2014-08-18 01:35:03.000000000 +1200
@@ -0,0 +1 @@
+wxpy3.0-compat.patch
diff -Nru squaremap-1.0.4/debian/patches/wxpy3.0-compat.patch squaremap-1.0.4/debian/patches/wxpy3.0-compat.patch
--- squaremap-1.0.4/debian/patches/wxpy3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200
+++ squaremap-1.0.4/debian/patches/wxpy3.0-compat.patch 2014-08-18 01:36:17.000000000 +1200
@@ -0,0 +1,17 @@
+Description: Fix deprecation warning
+ Patch maintains compatibility with wxPython 2.8 (wx.InitAllImageHandlers()
+ is a no-op there)
+Author: Olly Betts <[email protected]>
+Forwarded: no
+Last-Update: 2014-08-17
+
+--- a/squaremap/squaremap.py
++++ b/squaremap/squaremap.py
+@@ -486,7 +486,6 @@
+ """Basic application for holding the viewing Frame"""
+ def OnInit(self):
+ """Initialise the application"""
+- wx.InitAllImageHandlers()
+ self.frame = frame = wx.Frame( None,
+ )
+ frame.CreateStatusBar()
