[med-svn] [spades] 04/08: Merge branch 'next311'

[Sascha Steinbiss]

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

satta pushed a commit to branch master
in repository spades.

commit 3ccddc8d59a79cc4a9a52f96f8d5d7dc7e6c256e
Merge: 49633eb 63f26d0
Author: Sascha Steinbiss <satta at debian.org>
Date:   Mon Dec 18 00:26:46 2017 +0000

    Merge branch 'next311'

 debian/changelog                                   |   6 +-
 debian/patches/0003_accept-system-bwa.patch        |  18 +--
 debian/patches/0111_use_full_config_dirs.patch     |   8 +-
 debian/patches/0114_use_debian_provided_libs.patch | 166 +++++++--------------
 debian/patches/gcc7.patch                          |   8 +-
 debian/patches/spelling                            |  32 ++--
 6 files changed, 88 insertions(+), 150 deletions(-)

diff --cc debian/changelog
index cba556b,520e615..eed7705
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,14 @@@
- spades (3.10.1+dfsg-4) UNRELEASED; urgency=medium
 -spades (3.11.1+dfsg-1) unstable; urgency=medium
++spades (3.11.1+dfsg-1) UNRELEASED; urgency=medium
  
++  [ Sascha Steinbiss ]
+   * New upstream release.
+ 
 - -- Sascha Steinbiss <satta at debian.org>  Sun, 03 Sep 2017 22:56:54 +0200
++  [ Steffen Moeller ]
 +  * debian/upstream/metadata:
 +    - added references to registries
 +    - yamllint cleanliness
 +
 + -- Steffen Moeller <moeller at debian.org>  Sun, 10 Sep 2017 10:08:28 +0200
  
  spades (3.10.1+dfsg-3) unstable; urgency=medium
  

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