[Python-modules-commits] [python-fisx] 03/06: remo ve useless patches

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository python-fisx.

commit 77dc65fe41a1d4c97220f504963daa10f7394d35
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Aug 18 07:36:50 2016 +0200

    remo ve useless patches
---
 debian/changelog                                |  6 +++++
 debian/patches/0001-fix-test-on-python3.5.patch | 32 -------------------------
 debian/patches/series                           |  1 -
 3 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14736db..22c45be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-fisx (1.1.0-1) unstable; urgency=medium
+
+  * Imported Upstream version 1.1.0
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Wed, 17 Aug 2016 21:15:00 +0200
+
 python-fisx (1.0.8-1) unstable; urgency=low
 
   * Initial package (Closes: #827609)
diff --git a/debian/patches/0001-fix-test-on-python3.5.patch b/debian/patches/0001-fix-test-on-python3.5.patch
deleted file mode 100644
index 258d926..0000000
--- a/debian/patches/0001-fix-test-on-python3.5.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
- <picca at synchrotron-soleil.fr>
-Date: Sat, 25 Jun 2016 16:53:54 +0200
-Subject: fix test on python3.5
-
----
- python/fisx/DataDir.py | 12 ------------
- 1 file changed, 12 deletions(-)
-
-diff --git a/python/fisx/DataDir.py b/python/fisx/DataDir.py
-index 16ee9a5..f6d929d 100644
---- a/python/fisx/DataDir.py
-+++ b/python/fisx/DataDir.py
-@@ -30,18 +30,6 @@ import os
- FISX_DATA_DIR = 'DATA_DIR_FROM_SETUP'
- # this is to be filled by the setup
- FISX_DOC_DIR = 'DOC_DIR_FROM_SETUP'
--# what follows is only used in frozen versions
--if not os.path.exists(FISX_DATA_DIR):
--    tmp_dir = os.path.dirname(__file__)
--    old_tmp_dir = tmp_dir + "dummy"
--    basename = os.path.basename(FISX_DATA_DIR)
--    FISX_DATA_DIR = os.path.join(tmp_dir, "fisx", basename)
--    while (len(FISX_DATA_DIR) > 14) and (tmp_dir != old_tmp_dir):
--        if os.path.exists(FISX_DATA_DIR):
--            break
--        old_tmp_dir = tmp_dir
--        tmp_dir = os.path.dirname(tmp_dir)
--        FISX_DATA_DIR = os.path.join(tmp_dir, basename)
- 
- # this is used in build directory
- if not os.path.exists(FISX_DATA_DIR):
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c7440c8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-fix-test-on-python3.5.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-fisx.git