[med-svn] [circlator] 01/04: Fix canu detection

[Andreas Tille]

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

tille pushed a commit to branch master
in repository circlator.

commit b47bbfbd2635a593cb2a5f92949c3a64fd524c49
Author: Andreas Tille <tille at debian.org>
Date:   Sat Dec 2 16:47:05 2017 +0100

    Fix canu detection
---
 debian/changelog                        |  8 ++++++++
 debian/patches/fix_canu_detection.patch | 16 ++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 35035a0..751cf0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+circlator (1.5.1-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix canu detection
+    Closes: #880248
+
+ -- Andreas Tille <tille at debian.org>  Sat, 02 Dec 2017 16:44:51 +0100
+
 circlator (1.5.1-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/fix_canu_detection.patch b/debian/patches/fix_canu_detection.patch
new file mode 100644
index 0000000..7d188be
--- /dev/null
+++ b/debian/patches/fix_canu_detection.patch
@@ -0,0 +1,16 @@
+Description: Fix canu detection
+Autor: Andreas Tille <tille at debian.org>
+Last-Update: Sat, 02 Dec 2017 16:44:51 +0100
+Bug-Debian: https://bugs.debian.org/880248
+
+--- a/circlator/external_progs.py
++++ b/circlator/external_progs.py
+@@ -21,7 +21,7 @@ prog_to_version_cmd = {
+     'prodigal': ('-v', re.compile('^Prodigal V([0-9\.]+):')),
+     'samtools': ('', re.compile('^Version: ([0-9\.]+)')),
+     'spades': ('', re.compile('^SPAdes genome assembler v.?([0-9][0-9\.]+)')),
+-    'canu': ('-version', re.compile('^Canu.*v.?([0-9][0-9\.]+)')),
++    'canu': ('-version', re.compile('^Canu.*([0-9][0-9\.]+)')),
+ }
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..74c99f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_canu_detection.patch

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