[shark] 03/07: Cherry-pick patch series fixing FTBFS on Stretch.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository shark.

commit 88a25543afa2d97ede0e2213e52cd5dad791277e
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sun Aug 21 11:32:27 2016 +0100

    Cherry-pick patch series fixing FTBFS on Stretch.
    
    Gbp-Dch: short
    Closes: #831121
---
 .../Fix-missing-boost-namespace-prefix.patch        | 21 +++++++++++++++++++++
 debian/patches/Fix-missing-iostream-include.patch   | 21 +++++++++++++++++++++
 debian/patches/series                               |  2 ++
 3 files changed, 44 insertions(+)

diff --git a/debian/patches/Fix-missing-boost-namespace-prefix.patch b/debian/patches/Fix-missing-boost-namespace-prefix.patch
new file mode 100644
index 0000000..f166754
--- /dev/null
+++ b/debian/patches/Fix-missing-boost-namespace-prefix.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Sat, 13 Aug 2016 13:55:46 +0100
+Subject: Fix missing boost namespace prefix.
+
+---
+ include/shark/Core/utility/ZipPair.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/shark/Core/utility/ZipPair.h b/include/shark/Core/utility/ZipPair.h
+index 24cf730..a9cf0a2 100644
+--- a/include/shark/Core/utility/ZipPair.h
++++ b/include/shark/Core/utility/ZipPair.h
+@@ -142,7 +142,7 @@ boost::iterator_range<
+ >
+ zipPairRange(Iterator1 begin1, Iterator1 end1, Iterator2 begin2,Iterator2 end2){
+ 	typedef PairIterator<PairType,Iterator1,Iterator2> iterator;
+-	return make_iterator_range(iterator(begin1,begin2),iterator(end1,end2));
++	return boost::make_iterator_range(iterator(begin1,begin2),iterator(end1,end2));
+ }
+ 
+ template<class PairType, class Range1, class Range2>
diff --git a/debian/patches/Fix-missing-iostream-include.patch b/debian/patches/Fix-missing-iostream-include.patch
new file mode 100644
index 0000000..cac92eb
--- /dev/null
+++ b/debian/patches/Fix-missing-iostream-include.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Sat, 13 Aug 2016 13:47:55 +0100
+Subject: Fix missing iostream include.
+
+---
+ Test/LinAlg/BLAS/triangular_matrix.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Test/LinAlg/BLAS/triangular_matrix.cpp b/Test/LinAlg/BLAS/triangular_matrix.cpp
+index 11f8e8b..e1ea334 100644
+--- a/Test/LinAlg/BLAS/triangular_matrix.cpp
++++ b/Test/LinAlg/BLAS/triangular_matrix.cpp
+@@ -5,6 +5,8 @@
+ #include <shark/LinAlg/BLAS/triangular_matrix.hpp>
+ #include <shark/LinAlg/BLAS/matrix.hpp>
+ 
++#include <iostream>
++
+ using namespace shark;
+ using namespace blas;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 90a17d2..feaaed9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,5 @@ Fix-library-install-target.patch
 Disable-doxygen-generate-tagfile.patch
 Disable-privacy-breaching-content.patch
 Fix-CBLAS-detection-on-Debian.patch
+Fix-missing-iostream-include.patch
+Fix-missing-boost-namespace-prefix.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/shark.git