diff -u kiki-0.5.6/kiki.py kiki-0.5.6/kiki.py --- kiki-0.5.6/kiki.py +++ kiki-0.5.6/kiki.py @@ -23,7 +23,7 @@ """ import wxversion -wxversion.select('2.6') +wxversion.ensureMinimal('2.6') import wx import wx.html @@ -317,7 +317,7 @@ 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 -u kiki-0.5.6/debian/changelog kiki-0.5.6/debian/changelog --- kiki-0.5.6/debian/changelog +++ kiki-0.5.6/debian/changelog @@ -1,3 +1,10 @@ +kiki (0.5.6-3.1ubuntu1.9.04) jaunty; urgency=low + + * debian/control: updated dependency to also support wx 2.8 (Closes LP: #370839) + * kiki.py: make compatible with python-wxgtk2.8 + + -- Stani M Sun, 24 May 2009 00:16:06 +0200 + kiki (0.5.6-3.1ubuntu1) jaunty; urgency=low * Merge from debian unstable, remaining changes: (LP: #302016) diff -u kiki-0.5.6/debian/control kiki-0.5.6/debian/control --- kiki-0.5.6/debian/control +++ kiki-0.5.6/debian/control @@ -11,7 +11,7 @@ Package: kiki Architecture: all -Depends: ${python:Depends}, python-wxgtk2.6 +Depends: ${python:Depends}, python-wxgtk2.8 | python-wxgtk2.6 XB-Python-Version: ${python:Versions} Description: tool for python regular expression testing A free environment for regular expression testing (ferret). It allows