Package: pykaraoke
Version: 0.7.5-1
Severity: normal
Tags: patch pending
Dear maintainer,
I've uploaded an NMU for pykaraoke (versioned as 0.7.5-1.1). This is
the same as the patch I previously attached to #758948 except with the
changelog entry date touched.
Cheers,
Olly
diff -Nru pykaraoke-0.7.5/debian/changelog pykaraoke-0.7.5/debian/changelog
--- pykaraoke-0.7.5/debian/changelog 2011-11-29 13:21:54.000000000 +1300
+++ pykaraoke-0.7.5/debian/changelog 2014-10-07 22:42:45.000000000 +1300
@@ -1,3 +1,12 @@
+pykaraoke (0.7.5-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to use wxPython 3.0 (Closes: #758948):
+ + New patch: wxpython3.0.patch
+ * Drop dependency on python-wxgtk2.6 (Closes: #645568)
+
+ -- Olly Betts <[email protected]> Tue, 07 Oct 2014 09:42:38 +0000
+
pykaraoke (0.7.5-1) unstable; urgency=low
[ Miriam Ruiz ]
diff -Nru pykaraoke-0.7.5/debian/control pykaraoke-0.7.5/debian/control
--- pykaraoke-0.7.5/debian/control 2011-11-24 23:52:27.000000000 +1300
+++ pykaraoke-0.7.5/debian/control 2014-09-01 09:02:47.000000000 +1200
@@ -5,7 +5,7 @@
Uploaders: Miriam Ruiz <[email protected]>
Homepage: http://www.kibosh.org/pykaraoke/
Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.6.6-3~),
- libsdl-dev | libsdl1.2-dev, python-pygame, python-wxgtk2.8 | python-wxgtk2.6, quilt
+ libsdl-dev | libsdl1.2-dev, python-pygame, python-wxgtk3.0, quilt
Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/pykaraoke/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/python-apps/packages/pykaraoke/trunk/?op=log
Standards-Version: 3.9.2
@@ -13,7 +13,7 @@
Package: pykaraoke
Architecture: all
Depends: pykaraoke-bin (= ${source:Version}), python-pykaraoke (>= ${source:Version}),
- ${python:Depends}, python-pygame, python-wxgtk2.8 | python-wxgtk2.6, ${misc:Depends}
+ ${python:Depends}, python-pygame, python-wxgtk3.0, ${misc:Depends}
Suggests: python-numpy
Description: free CDG/MIDI/MPEG karaoke player
PyKaraoke is a free karaoke player. You can use this program to play your
diff -Nru pykaraoke-0.7.5/debian/patches/series pykaraoke-0.7.5/debian/patches/series
--- pykaraoke-0.7.5/debian/patches/series 2011-11-29 12:30:36.000000000 +1300
+++ pykaraoke-0.7.5/debian/patches/series 2014-09-01 09:01:29.000000000 +1200
@@ -2,3 +2,4 @@
fix_desktop_files.patch
remove_hashbangs.patch
fix_cdg2mpg_bashism.patch
+wxpython3.0.patch
diff -Nru pykaraoke-0.7.5/debian/patches/wxpython3.0.patch pykaraoke-0.7.5/debian/patches/wxpython3.0.patch
--- pykaraoke-0.7.5/debian/patches/wxpython3.0.patch 1970-01-01 12:00:00.000000000 +1200
+++ pykaraoke-0.7.5/debian/patches/wxpython3.0.patch 2014-09-01 10:51:27.000000000 +1200
@@ -0,0 +1,78 @@
+Description: Updates for wxPython 3.0
+ The third parameter when splitting a window is meant to be an integer, and
+ is optional. If omitted, it defaults to 0, which means "split in half"
+ which I assume is what passing 0.5 was intended to do (and 0.5 will get
+ cast to an integer, so passing 0.5 is just a confusing way to pass 0 here).
+ However, in the second case, for some reason it doesn't split in half with
+ wxPython3.0, so I've had to make it calculate half the window size explicitly.
+Author: Olly Betts <[email protected]>
+Bug-Debian: https://bugs.debian.org/758948
+Forwarded: no
+Last-Update: 2014-08-31
+
+Index: pykaraoke-0.7.5/pykaraoke.py
+===================================================================
+--- pykaraoke-0.7.5.orig/pykaraoke.py
++++ pykaraoke-0.7.5/pykaraoke.py
+@@ -128,13 +128,13 @@
+
+ import sys
+
+-# Ensure that we have at least wx version 2.6, but also protect
++# Ensure that we have at least wx version 2.8, but also protect
+ # wxversion against py2exe (wxversion requires actual wx directories
+ # on-disk, so it doesn't work in the py2exe-compiled version used for
+ # Windows distribution).
+ if not hasattr(sys, 'frozen'):
+ import wxversion
+- wxversion.ensureMinimal('2.6')
++ wxversion.ensureMinimal('2.8')
+
+ import os, string, wx, time, copy, types
+ from pykconstants import *
+@@ -944,9 +944,9 @@ class ConfigWindow (wx.Frame):
+ parent = self.parent
+ parent.splitter.Unsplit()
+ if splitVertically:
+- parent.splitter.SplitVertically(parent.leftPanel, parent.rightPanel, 0.5)
++ parent.splitter.SplitVertically(parent.leftPanel, parent.rightPanel)
+ else:
+- parent.splitter.SplitHorizontally(parent.leftPanel, parent.rightPanel, 0.5)
++ parent.splitter.SplitHorizontally(parent.leftPanel, parent.rightPanel)
+
+ # Save the auto play option
+ if self.AutoPlayCheckBox.IsChecked():
+@@ -1286,7 +1286,7 @@ class ExportWindow(wx.Frame):
+
+ dlg = wx.FileDialog(self, 'Export file',
+ wildcard = 'Text Files (*.txt)|*.txt|All files|*',
+- style = wx.SAVE | wx.OVERWRITE_PROMPT)
++ style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
+ result = dlg.ShowModal()
+ if result != wx.ID_OK:
+ dlg.Destroy()
+@@ -3390,9 +3390,9 @@ class PyKaraokeWindow (wx.Frame):
+ self.rightPanel.SetSizer(self.RightSizer)
+
+ if manager.settings.SplitVertically:
+- self.splitter.SplitVertically(self.leftPanel, self.rightPanel, 0.5)
++ self.splitter.SplitVertically(self.leftPanel, self.rightPanel, self.GetSizeTuple()[0] / 2)
+ else:
+- self.splitter.SplitHorizontally(self.leftPanel, self.rightPanel, 0.5)
++ self.splitter.SplitHorizontally(self.leftPanel, self.rightPanel, self.GetSizeTuple()[1] / 2)
+ self.splitter.SetMinimumPaneSize(1)
+
+ # Default start in Search View
+Index: pykaraoke-0.7.5/setup.py
+===================================================================
+--- pykaraoke-0.7.5.orig/setup.py
++++ pykaraoke-0.7.5/setup.py
+@@ -29,7 +29,7 @@ import glob
+ from pykenv import *
+
+ import wxversion
+-wxversion.ensureMinimal('2.6')
++wxversion.ensureMinimal('2.8')
+ import wx
+
+ # patch distutils if it can't cope with the "classifiers" or
