[med-svn] [kraken] 02/04: Merge branch 'master' into debian/jessie-backports-sloppy

[Andreas Tille]

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

tille pushed a commit to branch debian/jessie-backports-sloppy
in repository kraken.

commit 7b582fed44016a0bb24ae05f861748e7638921e3
Merge: 0e7b53d 386cb39
Author: Andreas Tille <tille at debian.org>
Date:   Tue Feb 6 14:49:01 2018 +0100

    Merge branch 'master' into debian/jessie-backports-sloppy

 CHANGELOG                  |  10 +++
 debian/changelog           |   8 ++
 debian/compat              |   2 +-
 debian/control             |   4 +-
 docs/MANUAL.html           | 218 +++++++++++++++++++++++++--------------------
 scripts/kraken             |  17 +++-
 scripts/read_merger.pl     |  59 +++++++++---
 scripts/rsync_from_ncbi.pl |   2 +-
 src/classify.cpp           | 200 ++++++++++++++++++++++++++++++++++++-----
 9 files changed, 385 insertions(+), 135 deletions(-)

diff --cc debian/changelog
index 6a3ab41,c106a40..622b59f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,18 @@@
+ kraken (1.1-1) unstable; urgency=medium
+ 
+   * New upstream version
+   * cme fix dpkg-control
+   * debhelper 11
+ 
+  -- Andreas Tille <tille at debian.org>  Tue, 06 Feb 2018 14:42:43 +0100
+ 
 +kraken (1.0-1~bpo8+1) jessie-backports-sloppy; urgency=medium
 +
 +  * Rebuild for jessie-backports-sloppy.
 +  * No hardening
 +
 + -- Andreas Tille <tille at debian.org>  Tue, 06 Feb 2018 12:26:39 +0100
 +
  kraken (1.0-1) unstable; urgency=medium
  
    * New upstream version

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