[med-svn] [manta] 01/01: Use Debian packaged python-pyflow

[Andreas Tille]

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

tille pushed a commit to branch master
in repository manta.

commit b3605b26e4d4c9ea58d58a6993d472931f5c6d39
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 15 16:12:22 2016 +0100

    Use Debian packaged python-pyflow
---
 debian/changelog                                |  1 -
 debian/control                                  |  3 ++-
 debian/patches/series                           |  1 +
 debian/patches/use_debian_packaged_pyflow.patch | 17 +++++++++++++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 81a0a54..1ed58ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 manta (1.0.2+dfsg-1) UNRELEASED; urgency=medium
 
-  TODO: https://github.com/Illumina/pyflow
   * Initial release (Closes: #<bug>)
 
  -- Andreas Tille <tille at debian.org>  Tue, 15 Nov 2016 14:29:08 +0100
diff --git a/debian/control b/debian/control
index 2d1a39f..caf450f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends: debhelper (>= 9),
                libboost-timer-dev,
                libboost-chrono-dev,
                libboost-test-dev,
-               zlib1g-dev
+               zlib1g-dev,
+               python-pyflow
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/manta.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/manta.git
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..de3c34f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_debian_packaged_pyflow.patch
diff --git a/debian/patches/use_debian_packaged_pyflow.patch b/debian/patches/use_debian_packaged_pyflow.patch
new file mode 100644
index 0000000..859d599
--- /dev/null
+++ b/debian/patches/use_debian_packaged_pyflow.patch
@@ -0,0 +1,17 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 15 Nov 2016 14:29:08 +0100
+Description: Check for Debian packaged pyflow.py
+
+--- a/redist/CMakeLists.txt
++++ b/redist/CMakeLists.txt
+@@ -183,9 +183,7 @@ endif ()
+ # pyflow
+ #
+ 
+-set(PYFLOW_PREFIX "pyflow-1.1.12")
+-set(PYFLOW_DIR "${CMAKE_CURRENT_BINARY_DIR}/${PYFLOW_PREFIX}")
+-set(PYFLOW_SCRIPT "${PYFLOW_DIR}/src/pyflow.py")
++set(PYFLOW_SCRIPT "/usr/lib/python2.7/dist-packages/pyflow/pyflow.py")
+ 
+ set (PYFLOW_DEPENDS "${PYFLOW_SCRIPT}")
+ add_custom_command(

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