[med-svn] r17842 - in trunk/packages/dicompyler/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-08-25 11:37:46 +0000 (Mon, 25 Aug 2014)
New Revision: 17842

Added:
   trunk/packages/dicompyler/trunk/debian/patches/wxpy30.patch
Modified:
   trunk/packages/dicompyler/trunk/debian/changelog
   trunk/packages/dicompyler/trunk/debian/control
   trunk/packages/dicompyler/trunk/debian/patches/series
Log:
Adapt to wxpython3.0 using wx-migration-tools


Modified: trunk/packages/dicompyler/trunk/debian/changelog
===================================================================
--- trunk/packages/dicompyler/trunk/debian/changelog	2014-08-25 11:36:53 UTC (rev 17841)
+++ trunk/packages/dicompyler/trunk/debian/changelog	2014-08-25 11:37:46 UTC (rev 17842)
@@ -1,3 +1,10 @@
+dicompyler (0.4.2-2) UNRELEASED; urgency=medium
+
+  * Adapt to wxpython3.0 using wx-migration-tools
+    Closes: #759056
+
+ -- Andreas Tille <tille at debian.org>  Mon, 25 Aug 2014 10:08:49 +0200
+
 dicompyler (0.4.2-1) unstable; urgency=medium
 
   * New upstream version

Modified: trunk/packages/dicompyler/trunk/debian/control
===================================================================
--- trunk/packages/dicompyler/trunk/debian/control	2014-08-25 11:36:53 UTC (rev 17841)
+++ trunk/packages/dicompyler/trunk/debian/control	2014-08-25 11:37:46 UTC (rev 17842)
@@ -16,7 +16,7 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${python:Depends},
-         python-wxgtk2.8,
+         python-wxgtk3.0,
          python-imaging,
          python-dicom,
          python-numpy,

Modified: trunk/packages/dicompyler/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicompyler/trunk/debian/patches/series	2014-08-25 11:36:53 UTC (rev 17841)
+++ trunk/packages/dicompyler/trunk/debian/patches/series	2014-08-25 11:37:46 UTC (rev 17842)
@@ -1 +1,2 @@
 do_not_download_distribute.patch
+wxpy30.patch

Added: trunk/packages/dicompyler/trunk/debian/patches/wxpy30.patch
===================================================================
--- trunk/packages/dicompyler/trunk/debian/patches/wxpy30.patch	                        (rev 0)
+++ trunk/packages/dicompyler/trunk/debian/patches/wxpy30.patch	2014-08-25 11:37:46 UTC (rev 17842)
@@ -0,0 +1,28 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 25 Aug 2014 10:08:49 +0200
+Bug-Debian: http://bugs.debian.org/759056
+Description: Apply wx-migration-tool which was developed by Olly Betts
+ http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git
+
+--- a/dicompyler/main.py
++++ b/dicompyler/main.py
+@@ -925,7 +925,7 @@ class MainFrame(wx.Frame):
+ 
+ class dicompyler(wx.App):
+     def OnInit(self):
+-        wx.InitAllImageHandlers()
++        # no-op in wxPython2.8 and later: wx.InitAllImageHandlers()
+         wx.GetApp().SetAppName("dicompyler")
+ 
+         # Load the XRC file for our gui resources
+--- a/dicompyler/wxmpl.py
++++ b/dicompyler/wxmpl.py
+@@ -1422,7 +1422,7 @@ class PlotFrame(wx.Frame):
+         fileName = wx.FileSelector('Save Plot', default_extension='png',
+             wildcard=('Portable Network Graphics (*.png)|*.png|'
+                 + 'Encapsulated Postscript (*.eps)|*.eps|All files (*.*)|*.*'),
+-            parent=self, flags=wx.SAVE|wx.OVERWRITE_PROMPT)
++            parent=self, flags=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+ 
+         if not fileName:
+             return