[med-svn] [idba] 03/04: New upstream version (upstream applied gcc-6 patches)

[Andreas Tille]

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

tille pushed a commit to branch master
in repository idba.

commit a8caf06effa82838452d684242ee902a06b2c544
Author: Andreas Tille <tille at debian.org>
Date:   Sat Aug 6 00:11:14 2016 +0200

    New upstream version (upstream applied gcc-6 patches)
---
 debian/changelog           |  6 +++++
 debian/patches/gcc-6.patch | 63 ----------------------------------------------
 debian/patches/series      |  1 -
 3 files changed, 6 insertions(+), 64 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f625ce..fa7469f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+idba (1.1.3-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Andreas Tille <tille at debian.org>  Sat, 06 Aug 2016 00:09:10 +0200
+
 idba (1.1.2-2) unstable; urgency=medium
 
   [Gert Wollny]
diff --git a/debian/patches/gcc-6.patch b/debian/patches/gcc-6.patch
deleted file mode 100644
index 343ea7f..0000000
--- a/debian/patches/gcc-6.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: compile with gcc-6 
-Forwarded: yes
-Bug-Debian: http://bugs.debian.org/811644
-Author: Gert Wollny <gw.fossdev at gmail.com>
-Last-Update: Fri, 1 Jul 2016
-
---- a/src/sequence/sequence_reader.cpp
-+++ b/src/sequence/sequence_reader.cpp
-@@ -47,11 +47,11 @@
- 
- bool FastaReader::ReadRecord(Sequence &seq, string &comment, string &quality)
- {
--    return ReadFasta(*is_, seq, comment);
-+    return ReadFasta(*is_, seq, comment).good();
- }
- 
- bool FastqReader::ReadRecord(Sequence &seq, string &comment, string &quality)
- {
--    return ReadFastq(*is_, seq, comment, quality);
-+    return ReadFastq(*is_, seq, comment, quality).good();
- }
- 
---- a/src/sequence/sequence_writer.cpp
-+++ b/src/sequence/sequence_writer.cpp
-@@ -46,11 +46,11 @@
- 
- bool FastaWriter::WriteRecord(const Sequence &seq, const string &comment, const string &quality)
- {
--    return WriteFasta(*os_, seq, comment);
-+    return WriteFasta(*os_, seq, comment).good();
- }
- 
- bool FastqWriter::WriteRecord(const Sequence &seq, const string &comment, const string &quality)
- {
--    return WriteFastq(*os_, seq, comment, quality);
-+    return WriteFastq(*os_, seq, comment, quality).good();
- }
- 
---- a/src/graph/hash_graph.h
-+++ b/src/graph/hash_graph.h
-@@ -188,8 +188,13 @@
-     void clear() { vertex_table_.clear(); num_edges_ = 0; }
- 
- private:
-+#if __cplusplus >= 201103L
-+    HashGraph(const HashGraph &) = delete;
-+    const HashGraph &operator =(const HashGraph &) = delete;
-+#else
-     HashGraph(const HashGraph &);
-     const HashGraph &operator =(const HashGraph &);
-+#endif
- 
-     bool GetNextVertexAdaptor(const HashGraphVertexAdaptor &current, HashGraphVertexAdaptor &next)
-     {
-@@ -428,7 +433,7 @@
- 
- namespace std
- {
--template <> inline void swap(HashGraph &x, HashGraph &y)
-+inline void swap(HashGraph &x, HashGraph &y)
- { x.swap(y); }
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 7efa1d4..a9a2390 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 use-atomic-for-mips.patch
 #clang.patch
-gcc-6.patch
 run_tests.patch
 spelling.patch

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