[med-svn] [pycorrfit] 05/06: d/patches: removed the old ones ( wx-migration-tools.patch fix_python_path.patch ) d/patches/fcs_data_set_syntax.patch: add colon after parentheses d/patches/inst_read_pt3_scripts.patch: force installation of read_pt3_scripts subdirectory
Alex Mestiashvili
malex-guest at moszumanska.debian.org
Wed Mar 18 17:33:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
malex-guest pushed a commit to branch master
in repository pycorrfit.
commit 31e451bec2fe3bce7a4a1d5b18220033579d6184
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date: Wed Mar 18 18:18:13 2015 +0100
d/patches: removed the old ones ( wx-migration-tools.patch
fix_python_path.patch )
d/patches/fcs_data_set_syntax.patch: add colon after parentheses
d/patches/inst_read_pt3_scripts.patch: force installation of read_pt3_scripts
subdirectory
---
debian/patches/fcs_data_set_syntax.patch | 13 ++++
debian/patches/fix_python_path.patch | 15 -----
debian/patches/inst_read_pt3_scripts.patch | 15 +++++
debian/patches/series | 4 +-
debian/patches/wx-migration-tools.patch | 105 -----------------------------
5 files changed, 30 insertions(+), 122 deletions(-)
diff --git a/debian/patches/fcs_data_set_syntax.patch b/debian/patches/fcs_data_set_syntax.patch
new file mode 100644
index 0000000..a7a1b1f
--- /dev/null
+++ b/debian/patches/fcs_data_set_syntax.patch
@@ -0,0 +1,13 @@
+Author: Alex Mestiashvili <alex at biotec.tu-dresden.de>
+Description: missing colon after parentheses
+--- pycorrfit.orig/pycorrfit/fcs_data_set.py
++++ pycorrfit/pycorrfit/fcs_data_set.py
+@@ -177,7 +177,7 @@
+ self.background1 is not None and
+ self.background2 is not None and
+ self.IsCrossCorrelation
+- )
++ ):
+ S = self.countrate1
+ S2 = self.countrate2
+ B = self.background1.countrate1
diff --git a/debian/patches/fix_python_path.patch b/debian/patches/fix_python_path.patch
deleted file mode 100644
index 2ec5cb3..0000000
--- a/debian/patches/fix_python_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
-Subject: fix path for PyCorrFit module
---- pycorrfit.orig/bin/pycorrfit
-+++ pycorrfit/bin/pycorrfit
-@@ -1,8 +1,8 @@
- #!/bin/sh
- # debian
--if [ -f "/usr/share/pyshared/pycorrfit/PyCorrFit.py" ]
-+if [ -f "/usr/lib/python2.7/dist-packages/pycorrfit/PyCorrFit.py" ]
- then
-- python /usr/share/pyshared/pycorrfit/PyCorrFit.py
-+ python /usr/lib/python2.7/dist-packages/pycorrfit/PyCorrFit.py
- elif [ -f "/usr/local/lib/python2.7/dist-packages/pycorrfit/PyCorrFit.py" ]
- # pip
- then
diff --git a/debian/patches/inst_read_pt3_scripts.patch b/debian/patches/inst_read_pt3_scripts.patch
new file mode 100644
index 0000000..7a96df4
--- /dev/null
+++ b/debian/patches/inst_read_pt3_scripts.patch
@@ -0,0 +1,15 @@
+--- pycorrfit.orig/setup.py
++++ pycorrfit/setup.py
+@@ -54,10 +54,12 @@
+ packages=['pycorrfit',
+ 'pycorrfit.models',
+ 'pycorrfit.readfiles',
++ 'pycorrfit.readfiles.read_pt3_scripts',
+ 'pycorrfit.tools'],
+ package_dir={'pycorrfit': 'pycorrfit',
+ 'pycorrfit.models': 'pycorrfit/models',
+ 'pycorrfit.readfiles': 'pycorrfit/readfiles',
++ 'pycorrfit.readfiles.read_pt3_scripts': 'pycorrfit/readfiles/read_pt3_scripts',
+ 'pycorrfit.tools': 'pycorrfit/tools'},
+ data_files=[('pycorrfit_doc', ['ChangeLog.txt', 'doc/PyCorrFit_doc.pdf'])],
+ license="GPL v2",
diff --git a/debian/patches/series b/debian/patches/series
index 6ceac18..5703a1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-fix_python_path.patch
-wx-migration-tools.patch
+inst_read_pt3_scripts.patch
+fcs_data_set_syntax.patch
diff --git a/debian/patches/wx-migration-tools.patch b/debian/patches/wx-migration-tools.patch
deleted file mode 100644
index 26ad683..0000000
--- a/debian/patches/wx-migration-tools.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-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