[med-svn] [pyscanfcs] 04/04: d/changelog: upload to unstable d/rules: avoid downloading of documentation file during clean stage d/patches: removed old patches

Alex Mestiashvili malex-guest at moszumanska.debian.org
Thu Feb 19 16:35:58 UTC 2015


This is an automated email from the git hooks/post-receive script.

malex-guest pushed a commit to branch master
in repository pyscanfcs.

commit 202354478c0d42a109c9ead41c0f5a03b91b34f6
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Thu Feb 19 14:45:01 2015 +0100

    d/changelog: upload to unstable
    d/rules: avoid downloading of documentation file during clean stage
    d/patches: removed old patches
---
 debian/changelog                         |  4 ++-
 debian/patches/fix_module_location.patch | 15 ------------
 debian/patches/series                    |  2 --
 debian/patches/wx-migration-tools.patch  | 42 --------------------------------
 debian/rules                             |  4 +++
 5 files changed, 7 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9654553..fb1fe10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-pyscanfcs (0.2.3-1) UNRELEASED; urgency=medium
+pyscanfcs (0.2.3-1) unstable; urgency=medium
 
   * Imported Upstream version 0.2.3
+  * d/rules: avoid downloading of documentation during clean stage 
+  * d/patches: removed old patches
 
  -- Alexandre Mestiashvili <alex at biotec.tu-dresden.de>  Wed, 18 Feb 2015 13:37:44 +0100
 
diff --git a/debian/patches/fix_module_location.patch b/debian/patches/fix_module_location.patch
deleted file mode 100644
index a87a7ce..0000000
--- a/debian/patches/fix_module_location.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Alex Mestiasvhili <alex at biotec.tu-dresden.de>
-Subject: use debian specific path for the module
---- pyscanfcs.orig/bin/pyscanfcs
-+++ pyscanfcs/bin/pyscanfcs
-@@ -13,6 +13,10 @@
- elif [ -f "../lib/python2.7/site-packages/pyscanfcs/PyScanFCS.py" ]
- then
-     python ../lib/python2.7/site-packages/pyscanfcs/PyScanFCS.py
-+# debian
-+elif [ -f "/usr/lib/python2.7/dist-packages/pyscanfcs/PyScanFCS.py" ]
-+then
-+    python /usr/lib/python2.7/dist-packages/pyscanfcs/PyScanFCS.py
- else
-     echo "Could not find PyScanFCS. Please notify the author."
- fi
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 222b082..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-wx-migration-tools.patch
-fix_module_location.patch
diff --git a/debian/patches/wx-migration-tools.patch b/debian/patches/wx-migration-tools.patch
deleted file mode 100644
index 80ef57e..0000000
--- a/debian/patches/wx-migration-tools.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Author: Alex Mestiashvili <alex at biotec.tu-dresden.de>
-Last-Update: Mon, 8 Sep 2014 10:41:28 +0200
-Bug-Debian: http://bugs.debian.org/759071
-Description: Use wxpy30-update to create a patch that enables wxpython3.0
---- pyscanfcs.orig/pyscanfcs/PyScanFCS.py
-+++ pyscanfcs/pyscanfcs/PyScanFCS.py
-@@ -1525,7 +1525,7 @@
-         """Import experimental data from a file."""
-         dlg = wx.FileDialog(self, "Choose a fits file", self.dirname, "", 
-               "FITS files (*.fits)|*.Fits;*.FITS;*.fits",
--              wx.OPEN)
-+              wx.FD_OPEN)
-         # user cannot do anything until he clicks "OK"
-         if dlg.ShowModal() == wx.ID_OK:
-         
-@@ -1605,7 +1605,7 @@
-         # File Dialog
-         dlg = wx.FileDialog(self, "Choose a data file", self.dirname, "", 
-               "DAT files (*.dat)|*.dat;*.daT;*.dAt;*.dAT;*.Dat;*.DaT;*.DAt;*.DAT",
--              wx.OPEN)
-+              wx.FD_OPEN)
-         # user cannot do anything until he clicks "OK"
-         if dlg.ShowModal() == wx.ID_OK:
-             # Workaround for Ubuntu 12.10 since 0.2.0
-@@ -1640,7 +1640,7 @@
-             newfilename = ""
-         dlg = wx.FileDialog(self, "Choose a data file", self.dirname, newfilename, 
-               "FITS files (*.fits)|*.Fits;*.FITS;*.fits",
--           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:
-             # Workaround for Ubuntu 12.10 since 0.2.0
-@@ -1714,7 +1714,7 @@
-             newfilename = self.filename[:-4]+"_32bit.dat"
-         dlg = wx.FileDialog(self, "Choose a data file", self.dirname, newfilename, 
-               "DAT files (*.dat)|*.dat;*.daT;*.dAt;*.dAT;*.Dat;*.DaT;*.DAt;*.DAT",
--           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:
-             # Workaround for Ubuntu 12.10 since 0.2.0
diff --git a/debian/rules b/debian/rules
index 7e7d31d..23afcfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,10 @@ pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 %:
 	dh $@ --with python2 --buildsystem=pybuild
 
+override_dh_auto_clean:
+	touch doc/PyScanFCS_doc.pdf
+	dh_auto_clean
+
 override_dh_auto_build:
 	cd $(DOCDIR) && pdflatex -synctex=1 -interaction=nonstopmode $(TEXDOC)
 	cd $(DOCDIR) && bibtex $(BIBDOC)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/pyscanfcs.git



More information about the debian-med-commit mailing list