[asl] 08/10: Cherry-pick upstream fix for FTBFS error.

[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 asl.

commit 8177f0e1ee063d868b92f30d26313210932e0523
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu May 5 20:26:57 2016 +0100

    Cherry-pick upstream fix for FTBFS error.
    
    Gbp-Dch: short
    Thanks: Martin Michlmayr
    Closes: 822469
---
 debian/patches/Replace-includes-math.h-cmath.patch | 104 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 2 files changed, 105 insertions(+)

diff --git a/debian/patches/Replace-includes-math.h-cmath.patch b/debian/patches/Replace-includes-math.h-cmath.patch
new file mode 100644
index 0000000..4ebd0cf
--- /dev/null
+++ b/debian/patches/Replace-includes-math.h-cmath.patch
@@ -0,0 +1,104 @@
+From: Avtech Scientific <AvtechScientific at users.noreply.github.com>
+Date: Thu, 24 Sep 2015 12:53:40 +0300
+Subject: Replace includes: math.h -> cmath
+
+---
+ src/aslUtilities.h                           | 10 +++++-----
+ src/math/aslInterpolation.h                  |  2 +-
+ src/math/aslVectorsDynamicLength.h           |  2 +-
+ src/math/aslVectorsDynamicLengthOperations.h |  3 +--
+ src/math/aslVectorsUtilities.h               |  5 ++---
+ 5 files changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/src/aslUtilities.h b/src/aslUtilities.h
+index feda553..f6b476b 100644
+--- a/src/aslUtilities.h
++++ b/src/aslUtilities.h
+@@ -26,12 +26,12 @@
+ #ifndef ASLUTILITIES_H
+ #define ASLUTILITIES_H
+ 
+-//#include <CL/cl.hpp>
+-// Supply "cl.hpp" with ASL, since it is not present in OpenCL 2.0
+-// Remove the file after switching to OpenCL 2.1
++//#include <CL/cl.hpp>
++// Supply "cl.hpp" with ASL, since it is not present in OpenCL 2.0
++// Remove the file after switching to OpenCL 2.1
+ #include "acl/cl.hpp"
+-#include "acl/aclStdIncludes.h"
+-#include <math.h>
++#include "acl/aclStdIncludes.h"
++#include <cmath>
+ #include <iostream>
+ #include <sstream>
+ #include <iomanip>
+diff --git a/src/math/aslInterpolation.h b/src/math/aslInterpolation.h
+index a1a37d0..2879e1b 100644
+--- a/src/math/aslInterpolation.h
++++ b/src/math/aslInterpolation.h
+@@ -28,7 +28,7 @@
+ 
+ 
+ #include "../aslUtilities.h"
+-#include <math.h>
++#include <cmath>
+ 
+ 
+ namespace asl
+diff --git a/src/math/aslVectorsDynamicLength.h b/src/math/aslVectorsDynamicLength.h
+index 4558612..5c65e76 100644
+--- a/src/math/aslVectorsDynamicLength.h
++++ b/src/math/aslVectorsDynamicLength.h
+@@ -28,7 +28,7 @@
+ 
+ 
+ #include "../aslUtilities.h"
+-#include <math.h>
++#include <cmath>
+ 
+ 
+ namespace asl
+diff --git a/src/math/aslVectorsDynamicLengthOperations.h b/src/math/aslVectorsDynamicLengthOperations.h
+index e417ff4..932c060 100644
+--- a/src/math/aslVectorsDynamicLengthOperations.h
++++ b/src/math/aslVectorsDynamicLengthOperations.h
+@@ -28,7 +28,7 @@
+ 
+ 
+ #include "../aslUtilities.h"
+-#include <math.h>
++#include <cmath>
+ 
+ 
+ namespace asl
+@@ -407,4 +407,3 @@ namespace asl
+ } // asl
+ 
+ #endif //ASLVECTORSDYNAMICLENGTH_H
+-
+diff --git a/src/math/aslVectorsUtilities.h b/src/math/aslVectorsUtilities.h
+index 607f714..69e1afb 100644
+--- a/src/math/aslVectorsUtilities.h
++++ b/src/math/aslVectorsUtilities.h
+@@ -28,14 +28,14 @@
+ 
+ 
+ #include "aslVectors.h"
+-#include <math.h>
++#include <cmath>
+ 
+ 
+ namespace asl {
+ 
+ 
+ /*
+-  ///  The function makese possible an output to a stream
++  ///  The function makes possible an output to a stream
+   template <int I,typename T> inline std::ostream& operator<<(std::ostream &f,const Vec<I,T> &a) {
+     for (int i(0);i<I-1;++i)f<<a[i]<<' ';  return f<<a[I-1];
+   }
+@@ -113,4 +113,3 @@ namespace asl {
+ }
+ 
+ #endif
+-
diff --git a/debian/patches/series b/debian/patches/series
index e283f80..dd27442 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 use-system-mathjax.patch
+Replace-includes-math.h-cmath.patch

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