[med-svn] [pycorrfit] 03/03: Use wxpy30-update to create a patch that enables wxpython3.0
Andreas Tille
tille at debian.org
Mon Aug 25 13:23:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository pycorrfit.
commit e8df140a7e28e86a1157346a871a2cd8a33ef0f8
Author: Andreas Tille <tille at debian.org>
Date: Mon Aug 25 15:23:18 2014 +0200
Use wxpy30-update to create a patch that enables wxpython3.0
---
debian/changelog | 2 +
debian/control | 2 +-
debian/patches/series | 1 +
debian/patches/wx-migration-tools.patch | 105 ++++++++++++++++++++++++++++++++
4 files changed, 109 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index ed104ce..df2b5d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ pycorrfit (0.8.3-2) UNRELEASED; urgency=medium
* debhelper 9
* cme fix dpkg-control
+ * Use wxpy30-update to create a patch that enables wxpython3.0
+ Closes: #759070
-- Andreas Tille <tille at debian.org> Mon, 25 Aug 2014 14:53:28 +0200
diff --git a/debian/control b/debian/control
index b641d07..252a1ca 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Depends: ${misc:Depends},
${python:Depends},
python-matplotlib,
python-scipy,
- python-wxgtk2.8,
+ python-wxgtk3.0,
python-numpy,
python-yaml
Recommends: python-sympy,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..48df457
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+wx-migration-tools.patch
diff --git a/debian/patches/wx-migration-tools.patch b/debian/patches/wx-migration-tools.patch
new file mode 100644
index 0000000..26ad683
--- /dev/null
+++ b/debian/patches/wx-migration-tools.patch
@@ -0,0 +1,105 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 25 Aug 2014 14:53:28 +0200
+Bug-Debian: http://bugs.debian.org/759070
+Description: Use wxpy30-update to create a patch that enables wxpython3.0
+
+--- a/src/edclasses.py
++++ b/src/edclasses.py
+@@ -140,7 +140,7 @@ def save_figure(self, evt=None):
+ # remove last |
+ fieltypestring = fieltypestring[:-1]
+ dlg = wx.FileDialog(parent, "Save figure", dirname, filename,
+- fieltypestring, wx.SAVE|wx.OVERWRITE_PROMPT)
++ fieltypestring, wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+ # png is default
+ dlg.SetFilterIndex(keys.index("png"))
+ # user cannot do anything until he clicks "OK"
+--- a/src/frontend.py
++++ b/src/frontend.py
+@@ -456,7 +456,7 @@ class MyFrame(wx.Frame):
+ # Add a model using the dialog.
+ filters = "text file (*.txt)|*.txt"
+ dlg = wx.FileDialog(self, "Open model file",
+- self.dirname, "", filters, wx.OPEN)
++ self.dirname, "", filters, wx.FD_OPEN)
+ if dlg.ShowModal() == wx.ID_OK:
+ NewModel = usermodel.UserModel(self)
+ # Workaround since 0.7.5
+@@ -721,7 +721,7 @@ class MyFrame(wx.Frame):
+ # This is wx widgets stuff.
+ filters = filters+"|"
+ dlg = wx.FileDialog(self, "Open data file",
+- self.dirname, "", filters, wx.OPEN)
++ self.dirname, "", filters, wx.FD_OPEN)
+ if dlg.ShowModal() == wx.ID_OK:
+ # The filename the page will get
+ path = dlg.GetPath() # Workaround since 0.7.5
+@@ -974,7 +974,7 @@ class MyFrame(wx.Frame):
+ # Add a separator if item is not last item
+ filters = filters+"|"
+ dlg = wx.FileDialog(self, "Open data files",
+- self.dirname, "", filters, wx.OPEN|wx.FD_MULTIPLE)
++ self.dirname, "", filters, wx.FD_OPEN|wx.FD_MULTIPLE)
+ if dlg.ShowModal() == wx.ID_OK:
+ Datafiles = dlg.GetFilenames()
+ # We rely on sorted filenames
+--- a/src/openfile.py
++++ b/src/openfile.py
+@@ -54,7 +54,7 @@ def ImportParametersYaml(parent, dirname
+ wc = [".pcfs", ".fcsfit-session.zip"]
+ wcstring = "PyCorrFit session (*.pcfs)|*{};*{}".format(wc[0], wc[1])
+ dlg = wx.FileDialog(parent, "Open session file", dirname, "",
+- wcstring, wx.OPEN)
++ wcstring, wx.FD_OPEN)
+ # user cannot do anything until he clicks "OK"
+ if dlg.ShowModal() == wx.ID_OK:
+ path = dlg.GetPath() # Workaround since 0.7.5
+@@ -94,7 +94,7 @@ def OpenSession(parent, dirname, session
+ wcstring = "PyCorrFit session (*.pcfs)|*{};*{}".format(wc[0], wc[1])
+ if sessionfile is None:
+ dlg = wx.FileDialog(parent, "Open session file", dirname, "",
+- wcstring, wx.OPEN)
++ wcstring, wx.FD_OPEN)
+ # user cannot do anything until he clicks "OK"
+ if dlg.ShowModal() == wx.ID_OK:
+ path = dlg.GetPath() # Workaround since 0.7.5
+@@ -359,7 +359,7 @@ def SaveSession(parent, dirname, Infodic
+ """
+ dlg = wx.FileDialog(parent, "Save session file", dirname, "",
+ "PyCorrFit session (*.pcfs)|*.pcfs",
+- wx.SAVE|wx.FD_OVERWRITE_PROMPT)
++ wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+ if dlg.ShowModal() == wx.ID_OK:
+ path = dlg.GetPath() # Workaround since 0.7.5
+ (dirname, filename) = os.path.split(path)
+@@ -610,7 +610,7 @@ def saveCSV(parent, dirname, Page):
+ dlg = wx.FileDialog(parent, "Save curve", dirname, filename,
+ "Correlation with trace (*.csv)|*.csv;*.CSV"+\
+ "|Correlation only (*.csv)|*.csv;*.CSV",
+- wx.SAVE|wx.FD_OVERWRITE_PROMPT)
++ wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+ # user cannot do anything until he clicks "OK"
+ if dlg.ShowModal() == wx.ID_OK:
+ path = dlg.GetPath() # Workaround since 0.7.5
+--- a/src/tools/background.py
++++ b/src/tools/background.py
+@@ -276,7 +276,7 @@ class BackgroundCorrection(wx.Frame):
+ # Add a separator
+ filters = filters+"|"
+ dlg = wx.FileDialog(self, "Choose a data file",
+- self.parent.dirname, "", filters, wx.OPEN)
++ self.parent.dirname, "", filters, wx.FD_OPEN)
+ if dlg.ShowModal() == wx.ID_OK:
+ # Workaround since 0.7.5
+ (dirname, filename) = os.path.split(dlg.GetPath())
+--- a/src/tools/statistics.py
++++ b/src/tools/statistics.py
+@@ -606,7 +606,7 @@ class Stat(wx.Frame):
+ dirname = self.parent.dirname
+ dlg = wx.FileDialog(self.parent, "Choose file to save", dirname,
+ "", "Text file (*.txt)|*.txt;*.TXT",
+- wx.SAVE|wx.FD_OVERWRITE_PROMPT)
++ wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+ # user cannot do anything until he clicks "OK"
+ if dlg.ShowModal() == wx.ID_OK:
+ filename = dlg.GetPath()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/pycorrfit.git
More information about the debian-med-commit
mailing list