[med-svn] [seer] 01/02: Merge branch 'master' into debian/jessie-backports

[Andreas Tille]

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

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

commit 09ca56115f3921b094eccf46067e3ddb6b6d4dd4
Merge: c8fa4f0 dd0c779
Author: Andreas Tille <tille at debian.org>
Date:   Thu Mar 30 08:50:22 2017 +0200

    Merge branch 'master' into debian/jessie-backports

 debian/README.Debian               | 13 +++++++++++++
 debian/changelog                   | 12 +++++++++---
 debian/mans/R_mds.1                | 32 ++++++++++++++++++++++++++++++++
 debian/mans/blast_top_hits.1       |  5 ++---
 debian/mans/combineKmers.1         |  3 +--
 debian/mans/filter_seer.1          |  3 +--
 debian/mans/hits_to_fastq.1        | 22 ++++++++++++++++++++++
 debian/mans/kmds.1                 | 12 +++++-------
 debian/mans/map_back.1             |  6 ++++--
 debian/mans/mapping_to_phandango.1 | 25 +++++++++++++++++++++++++
 debian/mans/mash2matrix.1          | 26 ++++++++++++++++++++++++++
 debian/mans/reformat_output.1      | 22 ++++++++++++++++++++++
 debian/mans/seer.1                 | 10 ++++------
 debian/rules                       |  5 ++++-
 14 files changed, 170 insertions(+), 26 deletions(-)

diff --cc debian/changelog
index eb8d81e,d6e7ce9..ccd086e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -11,6 -11,6 +11,12 @@@ seer (1.1.2-2) unstable; urgency=mediu
  
   -- Andreas Tille <tille at debian.org>  Wed, 22 Mar 2017 11:43:16 +0100
  
++seer (1.1.2-2~bpo8+1) jessie-backports; urgency=medium
++
++  * Rebuild for jessie-backports.
++
++ -- Andreas Tille <tille at debian.org>  Wed, 22 Mar 2017 12:16:57 +0100
++
  seer (1.1.2-1) unstable; urgency=medium
  
    * New upstream version

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