Control: tags 758714 + pending
Dear maintainer,
I've prepared an NMU for kiki (versioned as 0.5.6-8.1) and
uploaded it to DELAYED/5. The patch is the same as that in
the bug already, except debian/changelog now references the bug
number, and I updated the changelog entry date.
Please feel free to tell me if I should delay it longer.
Cheers,
Olly
diff -Nru kiki-0.5.6/debian/changelog kiki-0.5.6/debian/changelog
--- kiki-0.5.6/debian/changelog 2011-11-25 02:26:28.000000000 -0300
+++ kiki-0.5.6/debian/changelog 2014-09-06 22:19:40.000000000 -0300
@@ -1,3 +1,11 @@
+kiki (0.5.6-8.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to use wxPython 3.0 (Closes: #758714):
+ + New patch: 04_wxpy3.0-compat.patch
+
+ -- Olly Betts <o...@survex.com> Sun, 07 Sep 2014 01:19:05 +0000
+
kiki (0.5.6-8) unstable; urgency=low
* debian/patch:
diff -Nru kiki-0.5.6/debian/control kiki-0.5.6/debian/control
--- kiki-0.5.6/debian/control 2011-11-18 14:54:49.000000000 -0300
+++ kiki-0.5.6/debian/control 2014-08-18 08:40:14.000000000 -0300
@@ -11,7 +11,7 @@
Package: kiki
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk2.8
+Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk3.0
XB-Python-Version: ${python:Versions}
Description: tool for python regular expression testing
A free environment for regular expression testing (ferret). It allows
diff -Nru kiki-0.5.6/debian/patches/04_wxpy3.0-compat.patch kiki-0.5.6/debian/patches/04_wxpy3.0-compat.patch
--- kiki-0.5.6/debian/patches/04_wxpy3.0-compat.patch 1969-12-31 21:00:00.000000000 -0300
+++ kiki-0.5.6/debian/patches/04_wxpy3.0-compat.patch 2014-08-20 08:59:21.000000000 -0300
@@ -0,0 +1,27 @@
+Description: Updates for wxPython 3.0
+ Allow wxPython 3.0 to be used.
+ Avoid deprecation warning (wx.InitAllImageHandlers() is a no-op under wxPython
+ 2.8, so removing it remains compatible with wxPython 2.8).
+Author: Olly Betts <o...@survex.com>
+Forwarded: no
+Last-Update: 2014-08-20
+
+--- a/kiki.py
++++ b/kiki.py
+@@ -23,7 +23,7 @@
+ """
+
+ import wxversion
+-wxversion.select('2.8')
++wxversion.ensureMinimal('2.8')
+
+ import wx
+ import wx.html
+@@ -705,7 +705,6 @@
+ global settings
+ settings = Settings(dirname=".kiki", filename="kikicfg.py", debugfile="kikidebug")
+ Kiki = wx.PySimpleApp()
+- wx.InitAllImageHandlers()
+ mw = MyFrameWithEvents(None, -1, "")
+ mw.icon()
+ Kiki.SetTopWindow(mw)
diff -Nru kiki-0.5.6/debian/patches/series kiki-0.5.6/debian/patches/series
--- kiki-0.5.6/debian/patches/series 2011-11-25 02:11:40.000000000 -0300
+++ kiki-0.5.6/debian/patches/series 2014-08-20 08:55:39.000000000 -0300
@@ -1,3 +1,4 @@
01_path_changes.diff
02_remove_wx.NotebookSizer.diff
03_setup.py.diff
+04_wxpy3.0-compat.patch
