Package: kiki
Version: 0.5.6-6
Tags: patch
User: freewx-ma...@lists.alioth.debian.org
Usertags: wx2.6to2.8
I'm trying to get packages to migrate from wxwidgets2.6 to wxwidgets2.8
so we can remove the former from the archive - it's no longer supported
upstream, and wxwidgets3.0 is supposed to be out early next year.
I updated kiki as per the attached patch, and it appears to work fine.
It's not a package I'm familiar with, but it doesn't seem to have a lot
of functionality to test.
If you'd like me to NMU, please let me know.
Cheers,
Olly
diff -Nru kiki-0.5.6/debian/changelog kiki-0.5.6/debian/changelog
--- kiki-0.5.6/debian/changelog 2011-06-06 08:47:29.000000000 +1200
+++ kiki-0.5.6/debian/changelog 2011-10-19 00:28:02.000000000 +1300
@@ -1,3 +1,14 @@
+kiki (0.5.6-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update to use python-wxgtk2.8.
+ + New patch 02_remove_wx.NotebookSizer.diff to fix compatibility issue.
+ + Update 01_path_changes.diff to load kiki.xpm (which is in the package)
+ rather than kiki.ico (which isn't). Seems 2.6 never tries to load the
+ icon, but 2.8 does.
+
+ -- Olly Betts <o...@survex.com> Tue, 18 Oct 2011 11:27:09 +0000
+
kiki (0.5.6-6) unstable; urgency=low
* debian/patches:
diff -Nru kiki-0.5.6/debian/control kiki-0.5.6/debian/control
--- kiki-0.5.6/debian/control 2011-06-02 23:58:41.000000000 +1200
+++ kiki-0.5.6/debian/control 2011-10-18 23:56:40.000000000 +1300
@@ -11,7 +11,7 @@
Package: kiki
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk2.6
+Depends: ${python:Depends}, ${misc:Depends}, python-wxgtk2.8
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/01_path_changes.diff kiki-0.5.6/debian/patches/01_path_changes.diff
--- kiki-0.5.6/debian/patches/01_path_changes.diff 2010-05-05 09:39:34.000000000 +1200
+++ kiki-0.5.6/debian/patches/01_path_changes.diff 2011-10-19 00:26:59.000000000 +1300
@@ -7,7 +7,7 @@
"""
+import wxversion
-+wxversion.select('2.6')
++wxversion.select('2.8')
+
import wx
import wx.html
@@ -24,8 +24,9 @@
else:
self.path = path
iconfile = os.path.join(self.path, "kiki.ico")
-+ iconfile = "/usr/share/pixmaps/kiki.ico"
- theicon = wx.Icon(iconfile, wx.BITMAP_TYPE_ICO)
+- theicon = wx.Icon(iconfile, wx.BITMAP_TYPE_ICO)
++ iconfile = "/usr/share/pixmaps/kiki.xpm"
++ theicon = wx.Icon(iconfile, wx.BITMAP_TYPE_XPM)
self.SetIcon(theicon)
def changePage(self, event):
diff -Nru kiki-0.5.6/debian/patches/02_remove_wx.NotebookSizer.diff kiki-0.5.6/debian/patches/02_remove_wx.NotebookSizer.diff
--- kiki-0.5.6/debian/patches/02_remove_wx.NotebookSizer.diff 1970-01-01 12:00:00.000000000 +1200
+++ kiki-0.5.6/debian/patches/02_remove_wx.NotebookSizer.diff 2011-10-19 00:10:52.000000000 +1300
@@ -0,0 +1,28 @@
+Description: Eliminate use of deprecated wx.NotebookSizer
+ As of wx 2.6, wx.Notebook can just be placed directly in a normal sizer:
+ .
+ "wxNotebookSizer and wxBookCtrlSizer are now deprecated -- they are no longer
+ needed, you can treat wxNotebook as any other control and put it directly into
+ the sizer that was wxNotebookSizer's parent sizer in old code."
+ .
+ As of 2.7.1 wx.NotebookSizer has been removed.
+Author: Olly Betts <o...@survex.com>
+
+---
+
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: no
+Last-Update: 2011-10-18
+
+--- kiki-0.5.6.orig/kiki.py
++++ kiki-0.5.6/kiki.py
+@@ -317,7 +317,7 @@ class MyFrame(wx.Frame):
+ self.Notebook.AddPage(self.MatchesPane, "Matches")
+ self.Notebook.AddPage(self.SampleTextPane, "Sample text")
+ self.Notebook.AddPage(self.HelpPane, "Help")
+- TopPaneSizer.Add(wx.NotebookSizer(self.Notebook), 1, wx.EXPAND, 0)
++ TopPaneSizer.Add(self.Notebook, 1, wx.EXPAND, 0)
+ self.BottomPane.SetAutoLayout(1)
+ self.BottomPane.SetSizer(TopPaneSizer)
+ MainSizer.Add(self.SplitterWindow, 1, wx.EXPAND, 0)
diff -Nru kiki-0.5.6/debian/patches/series kiki-0.5.6/debian/patches/series
--- kiki-0.5.6/debian/patches/series 2011-06-06 07:59:06.000000000 +1200
+++ kiki-0.5.6/debian/patches/series 2011-10-19 00:28:55.000000000 +1300
@@ -1,2 +1,3 @@
01_path_changes.diff
+02_remove_wx.NotebookSizer.diff
03_setup.py.diff
