[med-svn] r17981 - trunk/packages/dicompyler/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2014-09-10 21:25:39 +0000 (Wed, 10 Sep 2014)
New Revision: 17981

Added:
   trunk/packages/dicompyler/trunk/debian/patches/wxpy30-more.patch
Modified:
   trunk/packages/dicompyler/trunk/debian/patches/series
Log:
Forgot to commit additional wypy30 patches


Modified: trunk/packages/dicompyler/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicompyler/trunk/debian/patches/series	2014-09-10 21:24:57 UTC (rev 17980)
+++ trunk/packages/dicompyler/trunk/debian/patches/series	2014-09-10 21:25:39 UTC (rev 17981)
@@ -1,2 +1,4 @@
 do_not_download_distribute.patch
 wxpy30.patch
+wxpy30-more.patch
+enable_pydicom_0.9.8.patch

Added: trunk/packages/dicompyler/trunk/debian/patches/wxpy30-more.patch
===================================================================
--- trunk/packages/dicompyler/trunk/debian/patches/wxpy30-more.patch	                        (rev 0)
+++ trunk/packages/dicompyler/trunk/debian/patches/wxpy30-more.patch	2014-09-10 21:25:39 UTC (rev 17981)
@@ -0,0 +1,139 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sat, 06 Sep 2014 15:57:29 +0200
+Bug-Debian: http://bugs.debian.org/759056
+Description: Further patches not applied by wx-migration-tool from
+ http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git
+
+--- a/dicompyler/baseplugins/anonymize.py
++++ b/dicompyler/baseplugins/anonymize.py
+@@ -10,7 +10,7 @@
+ 
+ import wx
+ from wx.xrc import XmlResource, XRCCTRL, XRCID
+-from wx.lib.pubsub import Publisher as pub
++from wx.lib.pubsub.core import Publisher as pub
+ import os, threading
+ from dicompyler import guiutil, util
+ 
+@@ -331,4 +331,4 @@ class AnonymizeDialog(wx.Dialog):
+         else:
+             self.privatetags = False
+ 
+-        self.EndModal(wx.ID_OK)
+\ No newline at end of file
++        self.EndModal(wx.ID_OK)
+--- a/dicompyler/baseplugins/treeview.py
++++ b/dicompyler/baseplugins/treeview.py
+@@ -13,7 +13,7 @@ logger = logging.getLogger('dicompyler.t
+ import threading, Queue
+ import wx
+ from wx.xrc import XmlResource, XRCCTRL, XRCID
+-from wx.lib.pubsub import Publisher as pub
++from wx.lib.pubsub.core import Publisher as pub
+ from wx.gizmos import TreeListCtrl as tlc
+ from dicompyler import guiutil, util
+ import dicom
+--- a/dicompyler/plugin.py
++++ b/dicompyler/plugin.py
+@@ -12,7 +12,7 @@ logger = logging.getLogger('dicompyler.p
+ import imp, os
+ import wx
+ from wx.xrc import *
+-from wx.lib.pubsub import Publisher as pub
++from wx.lib.pubsub.core import Publisher as pub
+ from dicompyler import guiutil, util
+ 
+ def import_plugins(userpath=None):
+--- a/dicompyler/baseplugins/quickopen.py
++++ b/dicompyler/baseplugins/quickopen.py
+@@ -11,7 +11,7 @@
+ import logging
+ logger = logging.getLogger('dicompyler.quickimport')
+ import wx
+-from wx.lib.pubsub import Publisher as pub
++from wx.lib.pubsub.core import Publisher as pub
+ from dicompyler import dicomparser, util
+ import dicom
+ 
+--- a/dicompyler/baseplugins/2dview.py
++++ b/dicompyler/baseplugins/2dview.py
+@@ -10,7 +10,7 @@
+ 
+ import wx
+ from wx.xrc import XmlResource, XRCCTRL, XRCID
+-from wx.lib.pubsub import Publisher as pub
++from wx.lib.pubsub.core import Publisher as pub
+ from matplotlib import _cntr as cntr
+ from matplotlib import __version__ as mplversion
+ import numpy as np
+@@ -723,4 +723,4 @@ class plugin2DView(wx.Panel):
+             menu.Append(id, "No tools found")
+             menu.Enable(id, False)
+         self.PopupMenu(menu)
+-        menu.Destroy()
+\ No newline at end of file
++        menu.Destroy()
+--- a/dicompyler/baseplugins/dvh.py
++++ b/dicompyler/baseplugins/dvh.py
+@@ -12,7 +12,7 @@
+ 
+ import wx
+ from wx.xrc import XmlResource, XRCCTRL, XRCID
+-from wx.lib.pubsub import Publisher as pub
++from wx.lib.pubsub.core import Publisher as pub
+ from dicompyler import guiutil, util
+ from dicompyler import dvhdata, guidvh
+ from dicompyler import wxmpl
+--- a/dicompyler/dicomgui.py
++++ b/dicompyler/dicomgui.py
+@@ -15,7 +15,7 @@ logger = logging.getLogger('dicompyler.d
+ import hashlib, os, threading
+ import wx
+ from wx.xrc import *
+-from wx.lib.pubsub import Publisher as pub
++from wx.lib.pubsub.core import Publisher as pub
+ import numpy as np
+ from dicompyler import dicomparser, dvhdoses, guiutil, util
+ 
+--- a/dicompyler/guiutil.py
++++ b/dicompyler/guiutil.py
+@@ -10,7 +10,7 @@
+ import util
+ import wx
+ from wx.xrc import XmlResource, XRCCTRL, XRCID
+-from wx.lib.pubsub import Publisher as pub
++from wx.lib.pubsub.core import Publisher as pub
+ 
+ def IsMSWindows():
+     """Are we running on Windows?
+--- a/dicompyler/main.py
++++ b/dicompyler/main.py
+@@ -20,7 +20,7 @@ from wx.xrc import *
+ import wx.lib.dialogs, webbrowser
+ # Uncomment line to setup pubsub for frozen targets on wxPython 2.8.11 and above
+ # from wx.lib.pubsub import setupv1
+-from wx.lib.pubsub import Publisher as pub
++from wx.lib.pubsub.core import Publisher as pub
+ from dicompyler import guiutil, util
+ from dicompyler import dicomgui, dvhdata, dvhdoses, dvhcalc
+ from dicompyler.dicomparser import DicomParser as dp
+--- a/dicompyler/preferences.py
++++ b/dicompyler/preferences.py
+@@ -10,7 +10,7 @@
+ import os
+ import wx
+ from wx.xrc import *
+-from wx.lib.pubsub import Publisher as pub
++from wx.lib.pubsub.core import Publisher as pub
+ from dicompyler import guiutil, util
+ 
+ try:
+@@ -374,7 +374,7 @@ def main():
+ 
+     import tempfile, os
+     import wx
+-    from wx.lib.pubsub import Publisher as pub
++    from wx.lib.pubsub.core import Publisher as pub
+ 
+     app = wx.App(False)
+