This is an automated email from the git hooks/post-receive script. kulvait-guest pushed a commit to branch master in repository dicompyler.
commit 186f24de4ec12afb84ab2de675d67ccb1ca111b3 Author: Vojtěch Kulvait <[email protected]> Date: Mon Sep 18 20:08:01 2017 +0200 Patch pubsub --- .gitignore | 2 + debian/changelog | 2 +- debian/patches/092017A_fixpubsub.patch | 191 +++++++++++++++++++++++++++++++++ debian/patches/series | 3 +- 4 files changed, 195 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3f77d3e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.pyc +.pc/ diff --git a/debian/changelog b/debian/changelog index c45c8f2..bac51c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ dicompyler (0.4.2.0-1) UNRELEASED; urgency=medium * More patches to finally work with wx 3.0 * Not really new upstream version but content of upstream source archive on Github has changed - + * wx.lib.pubsub fix according to https://wxpython.org/Phoenix/docs/html/wx.lib.pubsub.setuparg1.html -- Vojtěch Kulvait <[email protected]> Mon, 18 Sep 2017 09:54:37 +0200 dicompyler (0.4.2-4) unstable; urgency=medium diff --git a/debian/patches/092017A_fixpubsub.patch b/debian/patches/092017A_fixpubsub.patch new file mode 100644 index 0000000..d226eb1 --- /dev/null +++ b/debian/patches/092017A_fixpubsub.patch @@ -0,0 +1,191 @@ +Author: Vojtěch Kulvait <[email protected]> +Last-Update: Mon Sep 18 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854837 +Description: wx.lib.pubsub fix according to https://wxpython.org/Phoenix/docs/html/wx.lib.pubsub.setuparg1.html + +Index: dicompyler/dicompyler/baseplugins/2dview.py +=================================================================== +--- dicompyler.orig/dicompyler/baseplugins/2dview.py ++++ dicompyler/dicompyler/baseplugins/2dview.py +@@ -10,9 +10,8 @@ + + import wx + from wx.xrc import XmlResource, XRCCTRL, XRCID +-import wx.lib.pubsub.setuparg1 +-import wx.lib.pubsub.core +-pub = wx.lib.pubsub.core.Publisher() ++from wx.lib.pubsub import setuparg1 #see https://wxpython.org/Phoenix/docs/html/wx.lib.pubsub.setuparg1.html ++from wx.lib.pubsub import pub + from matplotlib import _cntr as cntr + from matplotlib import __version__ as mplversion + import numpy as np +@@ -725,4 +724,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() +Index: dicompyler/dicompyler/baseplugins/anonymize.py +=================================================================== +--- dicompyler.orig/dicompyler/baseplugins/anonymize.py ++++ dicompyler/dicompyler/baseplugins/anonymize.py +@@ -10,9 +10,8 @@ + + import wx + from wx.xrc import XmlResource, XRCCTRL, XRCID +-import wx.lib.pubsub.setuparg1 +-import wx.lib.pubsub.core +-pub = wx.lib.pubsub.core.Publisher() ++from wx.lib.pubsub import setuparg1 #see https://wxpython.org/Phoenix/docs/html/wx.lib.pubsub.setuparg1.html ++from wx.lib.pubsub import pub + import os, threading + from dicompyler import guiutil, util + +@@ -333,4 +332,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) +Index: dicompyler/dicompyler/baseplugins/dvh.py +=================================================================== +--- dicompyler.orig/dicompyler/baseplugins/dvh.py ++++ dicompyler/dicompyler/baseplugins/dvh.py +@@ -12,9 +12,8 @@ + + import wx + from wx.xrc import XmlResource, XRCCTRL, XRCID +-import wx.lib.pubsub.setuparg1 +-import wx.lib.pubsub.core +-pub = wx.lib.pubsub.core.Publisher() ++from wx.lib.pubsub import setuparg1 #see https://wxpython.org/Phoenix/docs/html/wx.lib.pubsub.setuparg1.html ++from wx.lib.pubsub import pub + from dicompyler import guiutil, util + from dicompyler import dvhdata, guidvh + from dicompyler import wxmpl +Index: dicompyler/dicompyler/baseplugins/quickopen.py +=================================================================== +--- dicompyler.orig/dicompyler/baseplugins/quickopen.py ++++ dicompyler/dicompyler/baseplugins/quickopen.py +@@ -11,9 +11,8 @@ + import logging + logger = logging.getLogger('dicompyler.quickimport') + import wx +-import wx.lib.pubsub.setuparg1 +-import wx.lib.pubsub.core +-pub = wx.lib.pubsub.core.Publisher() ++from wx.lib.pubsub import setuparg1 #see https://wxpython.org/Phoenix/docs/html/wx.lib.pubsub.setuparg1.html ++from wx.lib.pubsub import pub + from dicompyler import dicomparser, util + import dicom + +Index: dicompyler/dicompyler/baseplugins/treeview.py +=================================================================== +--- dicompyler.orig/dicompyler/baseplugins/treeview.py ++++ dicompyler/dicompyler/baseplugins/treeview.py +@@ -13,9 +13,8 @@ logger = logging.getLogger('dicompyler.t + import threading, Queue + import wx + from wx.xrc import XmlResource, XRCCTRL, XRCID +-import wx.lib.pubsub.setuparg1 +-import wx.lib.pubsub.core +-pub = wx.lib.pubsub.core.Publisher() ++from wx.lib.pubsub import setuparg1 #see https://wxpython.org/Phoenix/docs/html/wx.lib.pubsub.setuparg1.html ++from wx.lib.pubsub import pub + from wx.gizmos import TreeListCtrl as tlc + from dicompyler import guiutil, util + import dicom +Index: dicompyler/dicompyler/dicomgui.py +=================================================================== +--- dicompyler.orig/dicompyler/dicomgui.py ++++ dicompyler/dicompyler/dicomgui.py +@@ -15,9 +15,8 @@ logger = logging.getLogger('dicompyler.d + import hashlib, os, threading + import wx + from wx.xrc import * +-import wx.lib.pubsub.setuparg1 +-import wx.lib.pubsub.core +-pub = wx.lib.pubsub.core.Publisher() ++from wx.lib.pubsub import setuparg1 #see https://wxpython.org/Phoenix/docs/html/wx.lib.pubsub.setuparg1.html ++from wx.lib.pubsub import pub + import numpy as np + from dicompyler import dicomparser, dvhdoses, guiutil, util + +Index: dicompyler/dicompyler/guiutil.py +=================================================================== +--- dicompyler.orig/dicompyler/guiutil.py ++++ dicompyler/dicompyler/guiutil.py +@@ -10,9 +10,8 @@ + import util + import wx + from wx.xrc import XmlResource, XRCCTRL, XRCID +-import wx.lib.pubsub.setuparg1 +-import wx.lib.pubsub.core +-pub = wx.lib.pubsub.core.Publisher() ++from wx.lib.pubsub import setuparg1 #see https://wxpython.org/Phoenix/docs/html/wx.lib.pubsub.setuparg1.html ++from wx.lib.pubsub import pub + + def IsMSWindows(): + """Are we running on Windows? +Index: dicompyler/dicompyler/main.py +=================================================================== +--- dicompyler.orig/dicompyler/main.py ++++ dicompyler/dicompyler/main.py +@@ -20,9 +20,8 @@ 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 +-import wx.lib.pubsub.setuparg1 +-import wx.lib.pubsub.core +-pub = wx.lib.pubsub.core.Publisher() ++from wx.lib.pubsub import setuparg1 #see https://wxpython.org/Phoenix/docs/html/wx.lib.pubsub.setuparg1.html ++from wx.lib.pubsub import pub + from dicompyler import guiutil, util + from dicompyler import dicomgui, dvhdata, dvhdoses, dvhcalc + from dicompyler.dicomparser import DicomParser as dp +Index: dicompyler/dicompyler/plugin.py +=================================================================== +--- dicompyler.orig/dicompyler/plugin.py ++++ dicompyler/dicompyler/plugin.py +@@ -12,9 +12,8 @@ logger = logging.getLogger('dicompyler.p + import imp, os + import wx + from wx.xrc import * +-import wx.lib.pubsub.setuparg1 +-import wx.lib.pubsub.core +-pub = wx.lib.pubsub.core.Publisher() ++from wx.lib.pubsub import setuparg1 #see https://wxpython.org/Phoenix/docs/html/wx.lib.pubsub.setuparg1.html ++from wx.lib.pubsub import pub + from dicompyler import guiutil, util + + def import_plugins(userpath=None): +Index: dicompyler/dicompyler/preferences.py +=================================================================== +--- dicompyler.orig/dicompyler/preferences.py ++++ dicompyler/dicompyler/preferences.py +@@ -10,9 +10,8 @@ + import os + import wx + from wx.xrc import * +-import wx.lib.pubsub.setuparg1 +-import wx.lib.pubsub.core +-pub = wx.lib.pubsub.core.Publisher() ++from wx.lib.pubsub import setuparg1 #see https://wxpython.org/Phoenix/docs/html/wx.lib.pubsub.setuparg1.html ++from wx.lib.pubsub import pub + from dicompyler import guiutil, util + + try: +@@ -376,9 +375,8 @@ def main(): + + import tempfile, os + import wx +- import wx.lib.pubsub.setuparg1 +- import wx.lib.pubsub.core +- pub = wx.lib.pubsub.core.Publisher() ++ from wx.lib.pubsub import setuparg1 #see https://wxpython.org/Phoenix/docs/html/wx.lib.pubsub.setuparg1.html ++ from wx.lib.pubsub import pub + + app = wx.App(False) + diff --git a/debian/patches/series b/debian/patches/series index 5b1d765..7e13617 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,5 +6,4 @@ allow_pillow_instead_of_pil.patch enable_later_versions_of_matplotlib.patch fix-xrc-errors.patch fix_DicomImporterDialog.patch -more_wx30_patches.patch -01.patch +092017A_fixpubsub.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dicompyler.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
