[Python-modules-commits] r30293 - in packages/python-dsv/trunk/debian (4 files)

[ucko at users.alioth.debian.org]

    Date: Thursday, August 28, 2014 @ 03:24:24
  Author: ucko
Revision: 30293

Update for wxPython 3.0.  (Closes: #759076.)

* debian/control: Suggest python-wxgtk3.0 over 2.8.
* debian/patches/04-wx3.0-compat.patch (new): Make the import dialog and
  its demo play better with wxPython 3.0.

Added:
  packages/python-dsv/trunk/debian/patches/04-wx3.0-compat.patch
Modified:
  packages/python-dsv/trunk/debian/changelog
  packages/python-dsv/trunk/debian/control
  packages/python-dsv/trunk/debian/patches/series

Modified: packages/python-dsv/trunk/debian/changelog
===================================================================
--- packages/python-dsv/trunk/debian/changelog	2014-08-27 18:17:43 UTC (rev 30292)
+++ packages/python-dsv/trunk/debian/changelog	2014-08-28 03:24:24 UTC (rev 30293)
@@ -1,9 +1,16 @@
 python-dsv (1.4.1-3) UNRELEASED; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:02:31 +0200
+  [ Aaron M. Ucko ]
+  * debian/control:
+    - Suggest python-wxgtk3.0 over 2.8.
+  * debian/patches/04-wx3.0-compat.patch (new): Make the import dialog and
+    its demo play better with wxPython 3.0.  (Closes: #759076.)
 
+ -- Aaron M. Ucko <ucko at debian.org>  Wed, 27 Aug 2014 23:24:17 -0400
+
 python-dsv (1.4.1-2) unstable; urgency=low
 
   * debian/source/format: advance to 3.0 (quilt).

Modified: packages/python-dsv/trunk/debian/control
===================================================================
--- packages/python-dsv/trunk/debian/control	2014-08-27 18:17:43 UTC (rev 30292)
+++ packages/python-dsv/trunk/debian/control	2014-08-28 03:24:24 UTC (rev 30293)
@@ -12,7 +12,7 @@
 Package: python-dsv
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Suggests: python-wxgtk2.8
+Suggests: python-wxgtk3.0 | python-wxgtk2.8
 Provides: ${python:Provides}
 Description: Python module for delimiter-separated-value files
  Python-DSV is an alternative to Python's standard csv module, with

Added: packages/python-dsv/trunk/debian/patches/04-wx3.0-compat.patch
===================================================================
--- packages/python-dsv/trunk/debian/patches/04-wx3.0-compat.patch	                        (rev 0)
+++ packages/python-dsv/trunk/debian/patches/04-wx3.0-compat.patch	2014-08-28 03:24:24 UTC (rev 30293)
@@ -0,0 +1,21 @@
+--- a/DSV/DSV.py
++++ b/DSV/DSV.py
+@@ -676,7 +676,7 @@ if wx is not None:
+                      style = wx.TAB_TRAVERSAL, name = "ImportWizardPanel"):
+             wx.Panel.__init__(self, parent, id, pos, size, style, name)
+             self.SetAutoLayout(True)
+-            mainSizer = wx.FlexGridSizer(3, 1)
++            mainSizer = wx.FlexGridSizer(4, 1)
+             self.SetSizer(mainSizer)
+             mainSizer.AddGrowableCol(0)
+ 
+@@ -1089,7 +1089,8 @@ if __name__ == '__main__':
+                 else:
+                     dlg.Destroy()
+ 
+-                return True
++                # return True
++                sys.exit()
+ 
+         app = SampleApp()
+         app.MainLoop()

Modified: packages/python-dsv/trunk/debian/patches/series
===================================================================
--- packages/python-dsv/trunk/debian/patches/series	2014-08-27 18:17:43 UTC (rev 30292)
+++ packages/python-dsv/trunk/debian/patches/series	2014-08-28 03:24:24 UTC (rev 30293)
@@ -1,3 +1,4 @@
 01-leave-env-alone.patch -p1
 02-wx-namespace-transition.patch -p1
 03-avoid-unicoditis.patch -p1
+04-wx3.0-compat.patch