[Python-apps-commits] r13797 - in packages/pykaraoke/trunk/debian (4 files)

Sat Dec 17 10:59:24 UTC 2016

Date: Saturday, December 17, 2016 @ 10:59:23
  Author: wrar
Revision: 13797

Commit changes from the 0.7.5-1.1 NMU.

Added:
  packages/pykaraoke/trunk/debian/patches/wxpython3.0.patch
Modified:
  packages/pykaraoke/trunk/debian/changelog
  packages/pykaraoke/trunk/debian/control
  packages/pykaraoke/trunk/debian/patches/series

Modified: packages/pykaraoke/trunk/debian/changelog
===================================================================

--- packages/pykaraoke/trunk/debian/changelog	2016-12-15 21:35:34 UTC (rev 13796)
+++ packages/pykaraoke/trunk/debian/changelog	2016-12-17 10:59:23 UTC (rev 13797)
@@ -1,14 +1,19 @@
 pykaraoke (0.7.5-2) UNRELEASED; urgency=low
 
-  [ Stefano Rivera ]
-  * Remove alternate Build-Dependency on python-wxgtk2.6. Thanks Olly Betts
-    (Closes: #645568)
-
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
  -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 18:05:34 +0200
 
+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 <olly at survex.com>  Tue, 07 Oct 2014 09:42:38 +0000
+
 pykaraoke (0.7.5-1) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/pykaraoke/trunk/debian/control
===================================================================
--- packages/pykaraoke/trunk/debian/control	2016-12-15 21:35:34 UTC (rev 13796)
+++ packages/pykaraoke/trunk/debian/control	2016-12-17 10:59:23 UTC (rev 13797)
@@ -5,7 +5,7 @@
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>
 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, quilt
+ libsdl-dev | libsdl1.2-dev, python-pygame, python-wxgtk3.0, quilt
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/pykaraoke/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/pykaraoke/trunk/
 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

Modified: packages/pykaraoke/trunk/debian/patches/series
===================================================================
--- packages/pykaraoke/trunk/debian/patches/series	2016-12-15 21:35:34 UTC (rev 13796)
+++ packages/pykaraoke/trunk/debian/patches/series	2016-12-17 10:59:23 UTC (rev 13797)
@@ -2,3 +2,4 @@
 fix_desktop_files.patch
 remove_hashbangs.patch
 fix_cdg2mpg_bashism.patch
+wxpython3.0.patch

Added: packages/pykaraoke/trunk/debian/patches/wxpython3.0.patch
===================================================================
--- packages/pykaraoke/trunk/debian/patches/wxpython3.0.patch	                        (rev 0)
+++ packages/pykaraoke/trunk/debian/patches/wxpython3.0.patch	2016-12-17 10:59:23 UTC (rev 13797)
@@ -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 <olly at survex.com>
+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


