[med-svn] [murasaki] 02/03: Correct gcc-6 patch and add changelog entry

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository murasaki.

commit 2ef4ae18dd564a1b0f9a65fb62a4022a12b6a269
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Thu Jun 30 09:15:42 2016 +0000

    Correct gcc-6 patch and add changelog entry
---
 debian/changelog           |  6 ++++++
 debian/patches/gcc-6.patch | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e43185e..12bcaa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+murasaki (1.68.6-6) UNRELEASED; urgency=medium
+
+  * d/p/gcc-6: Add patch to compile with gcc-6: Closes: #811815
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Thu, 30 Jun 2016 09:15:01 +0000
+
 murasaki (1.68.6-5) unstable; urgency=medium
 
   * Upstream-Contact does not work any more
diff --git a/debian/patches/gcc-6.patch b/debian/patches/gcc-6.patch
index 36156b1..d9db49a 100644
--- a/debian/patches/gcc-6.patch
+++ b/debian/patches/gcc-6.patch
@@ -1,3 +1,8 @@
+From: Gert Wollny <gw.fossdev at gmail.com>
+Date: Thu, 30 Jun 2014 11:14:43 +0200
+Subject: Fix compilation with g++-6
+Bug-Debian: https://bugs.debian.org/811815
+
 --- a/src/sequence.cc
 +++ b/src/sequence.cc
 @@ -2045,7 +2045,9 @@
@@ -11,3 +16,12 @@
      for(unsigned i=1;i<histo.size();i++){
        of << i << "\t" << histo[i]<<endl;
      }
+@@ -3209,7 +3211,7 @@
+ 	os << last->first << ":" << last->second;
+       }
+ 
+-      if(opt.bitscore && bitos!=cerr){
++      if(opt.bitscore && & bitos != &cerr){
+ 	pair<SeqPos,SeqPos> scores(s->bitscore());
+ 	bitos << scores.first << "\t" << scores.second << endl;
+       }

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