[med-svn] [circlator] 03/04: new upstream release

[Sascha Steinbiss]

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

satta pushed a commit to branch master
in repository circlator.

commit 3b4c907dffabbf0e0607525d91136fa95d554a53
Author: Sascha Steinbiss <satta at debian.org>
Date:   Wed Jan 31 16:12:19 2018 +0100

    new upstream release
---
 debian/changelog                        |  7 +++++++
 debian/patches/fix_canu_detection.patch | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8789ffc..7dfba7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+circlator (1.5.5-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+
+ -- Sascha Steinbiss <satta at debian.org>  Wed, 31 Jan 2018 16:09:32 +0100
+
 circlator (1.5.1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/fix_canu_detection.patch b/debian/patches/fix_canu_detection.patch
index 7d188be..70ff61f 100644
--- a/debian/patches/fix_canu_detection.patch
+++ b/debian/patches/fix_canu_detection.patch
@@ -5,12 +5,12 @@ 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\.]+)')),
+@@ -19,7 +19,7 @@
+     'prodigal': ('-v', re.compile(r'^Prodigal V([0-9\.]+):')),
+     'samtools': ('', re.compile(r'Version: (\d+\.\d+[\.\d]*)')),
+     'spades': ('-v', re.compile(r'v.?([0-9][0-9\.]+)')),
+-    'canu': ('-version', re.compile(r'^Canu \D*([\d][\d\.]+)')),
 +    'canu': ('-version', re.compile('^Canu.*([0-9][0-9\.]+)')),
  }
  
- 
+ min_versions = {

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