[asl] 17/27: Update patch queue.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sat Nov 26 16:35:44 UTC 2016
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 8ca632588cd340079c888f70d45412bc9ddfe916
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Wed Nov 23 10:42:42 2016 +0000
Update patch queue.
- Drop Explicitly-define-namespace-of-ifstream-and-ofstream.patch,
applied upstream.
- Drop Replace-includes-math.h-cmath.patch, applied upstream.
- Refresh Use-system-MathJax.patch.
- New patch Fix-spelling-errors-reported-by-Lintian.patch.
Gbp-Dch: full
---
...define-namespace-of-ifstream-and-ofstream.patch | 55 ----------
.../Fix-spelling-errors-reported-by-Lintian.patch | 117 +++++++++++++++++++++
debian/patches/Replace-includes-math.h-cmath.patch | 104 ------------------
...stem-mathjax.patch => Use-system-MathJax.patch} | 16 ++-
debian/patches/series | 5 +-
5 files changed, 130 insertions(+), 167 deletions(-)
diff --git a/debian/patches/Explicitly-define-namespace-of-ifstream-and-ofstream.patch b/debian/patches/Explicitly-define-namespace-of-ifstream-and-ofstream.patch
deleted file mode 100644
index 46aa148..0000000
--- a/debian/patches/Explicitly-define-namespace-of-ifstream-and-ofstream.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: =?utf-8?q?Bart=C5=82omiej_Piotrowski?= <b at bpiotrowski.pl>
-Date: Mon, 21 Dec 2015 19:49:51 +0100
-Subject: Explicitly define namespace of ifstream and ofstream
-
-With GCC 5.3.0 and Boost 1.60.0, the build fails with following error:
-/build/libasl/src/ASL-0.1.6/src/utilities/aslParametersManager.cxx:466:6:
-error: reference to 'ifstream' is ambiguous
- ifstream ifs(p.string());
- ^
-/usr/include/boost/filesystem/fstream.hpp:169:32: note: candidates are:
-typedef class boost::filesystem::basic_ifstream<char> boost::filesystem::ifstream
- typedef basic_ifstream<char> ifstream;
- ^
----
- src/utilities/aslParametersManager.cxx | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/utilities/aslParametersManager.cxx b/src/utilities/aslParametersManager.cxx
-index 98a0192..d6ef3c7 100644
---- a/src/utilities/aslParametersManager.cxx
-+++ b/src/utilities/aslParametersManager.cxx
-@@ -332,7 +332,7 @@ namespace asl
-
- try
- {
-- ifstream ifs(paramFile);
-+ std::ifstream ifs(paramFile);
- if (!ifs.good())
- errorMessage("Can not open parameters file: " + paramFile);
-
-@@ -357,7 +357,7 @@ namespace asl
-
- void ParametersManager::writeParametersFile(const std::string fileName)
- {
-- ofstream fo(fileName);
-+ std::ofstream fo(fileName);
- if (!fo.good())
- errorMessage("ParametersManager::writeParametersFile() - can not open file: " + fileName);
-
-@@ -463,7 +463,7 @@ namespace asl
- }
- else
- {
-- ifstream ifs(p.string());
-+ std::ifstream ifs(p.string());
- if (ifs.good())
- {
- parsed_options parsed = parse_config_file(ifs, allOptions, true);
-@@ -514,4 +514,4 @@ namespace asl
- }
- }
-
--} //namespace asl
-\ No newline at end of file
-+} //namespace asl
diff --git a/debian/patches/Fix-spelling-errors-reported-by-Lintian.patch b/debian/patches/Fix-spelling-errors-reported-by-Lintian.patch
new file mode 100644
index 0000000..fa483e6
--- /dev/null
+++ b/debian/patches/Fix-spelling-errors-reported-by-Lintian.patch
@@ -0,0 +1,117 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Wed, 9 Nov 2016 19:52:32 +0000
+Subject: Fix spelling errors reported by Lintian.
+
+---
+ src/acl/acl.cxx | 2 +-
+ src/acl/aclMath/aclBarycentric.cxx | 4 ++--
+ src/math/aslBarycentric.cxx | 4 ++--
+ src/math/aslTemplateVE.cxx | 8 ++++----
+ src/num/aslFDAdvectionDiffusion.cxx | 2 +-
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/acl/acl.cxx b/src/acl/acl.cxx
+index 7ae8239..0e2546f 100644
+--- a/src/acl/acl.cxx
++++ b/src/acl/acl.cxx
+@@ -412,7 +412,7 @@ namespace acl
+ s="nan(uint(1))";
+ break;
+ default:
+- errorMessage("nan: the input variable has an uncorrect type");
++ errorMessage("nan: the input variable has an incorrect type");
+ }
+ return Element(new OperatorGeneric(s));
+ }
+diff --git a/src/acl/aclMath/aclBarycentric.cxx b/src/acl/aclMath/aclBarycentric.cxx
+index 473cb7b..5247730 100644
+--- a/src/acl/aclMath/aclBarycentric.cxx
++++ b/src/acl/aclMath/aclBarycentric.cxx
+@@ -80,7 +80,7 @@ namespace acl
+ const VectorOfElements & f)
+ {
+ if(p.size()+1 != f.size())
+- errorMessage("Barycentric::interpolate: number of funciton values does not corresponds to the dimensionality");
++ errorMessage("Barycentric::interpolate: number of function values does not corresponds to the dimensionality");
+
+ VectorOfElements fm(subVE(f, 1, p.size()) - catN(subVE(f, 0), p.size()));
+ return subVE(f,0) + fm * getCordinates(p);
+@@ -100,7 +100,7 @@ namespace acl
+ VectorOfElements Barycentric::gradient(const VectorOfElements & f)
+ {
+ if(t.getNRows()+1 != f.size())
+- errorMessage("Barycentric::gradient: number of funciton values does not corresponds to the dimensionality");
++ errorMessage("Barycentric::gradient: number of function values does not corresponds to the dimensionality");
+ unsigned int nd(f.size()-1);
+ VectorOfElements fm(subVE(f, 1, nd) - catN(subVE(f, 0), nd));
+ return fm*tInv;
+diff --git a/src/math/aslBarycentric.cxx b/src/math/aslBarycentric.cxx
+index 9325c97..a4eeba3 100644
+--- a/src/math/aslBarycentric.cxx
++++ b/src/math/aslBarycentric.cxx
+@@ -72,7 +72,7 @@ namespace asl
+ const AVec<> & f)
+ {
+ if(p.getSize()+1 != f.getSize())
+- errorMessage("Barycentric::interpolate: number of funciton values does not corresponds to the dimensionality");
++ errorMessage("Barycentric::interpolate: number of function values does not corresponds to the dimensionality");
+
+ AVec<> fm(subAVec(f, 1, p.getSize()) - AVec<>(p.getSize(), f[0]));
+ return f[0] + fm * getCordinates(p);
+@@ -91,7 +91,7 @@ namespace asl
+ AVec<> Barycentric::gradient(const AVec<> & f)
+ {
+ if(t.getNRow()+1 != f.getSize())
+- errorMessage("Barycentric::gradient: number of funciton values does not corresponds to the dimensionality");
++ errorMessage("Barycentric::gradient: number of function values does not corresponds to the dimensionality");
+ unsigned int nd(f.getSize()-1);
+ AVec<> fm(subAVec(f, 1, nd) - AVec<>(nd,f[0]));
+ return fm*tInv;
+diff --git a/src/math/aslTemplateVE.cxx b/src/math/aslTemplateVE.cxx
+index 24562e7..ff502d1 100644
+--- a/src/math/aslTemplateVE.cxx
++++ b/src/math/aslTemplateVE.cxx
+@@ -138,26 +138,26 @@ namespace asl
+ TemplateVE operator+ (const TemplateVE &a, const TemplateVE &b)
+ {
+ if (a.vectorTemplate != b.vectorTemplate)
+- errorMessage ("Two TemplateVE corespond to different templates");
++ errorMessage ("Two TemplateVE correspond to different templates");
+ return TemplateVE (a.values+b.values,*a.vectorTemplate);
+ }
+ TemplateVE operator- (const TemplateVE &a, const TemplateVE &b)
+ {
+ if (a.vectorTemplate != b.vectorTemplate)
+- errorMessage ("Two TemplateVE corespond to different templates");
++ errorMessage ("Two TemplateVE correspond to different templates");
+ return TemplateVE (a.values-b.values,*a.vectorTemplate);
+ }
+ TemplateVE operator* (const TemplateVE &a, const TemplateVE &b)
+ {
+ if (a.vectorTemplate != b.vectorTemplate)
+- errorMessage ("Two TemplateVE corespond to different templates");
++ errorMessage ("Two TemplateVE correspond to different templates");
+ return TemplateVE (productOfElements (a.values,b.values),*a.vectorTemplate);
+ }
+
+ TemplateVE operator/ (const TemplateVE &a, const TemplateVE &b)
+ {
+ if (a.vectorTemplate != b.vectorTemplate)
+- errorMessage ("Two TemplateVE corespond to different templates");
++ errorMessage ("Two TemplateVE correspond to different templates");
+ return TemplateVE (divisionOfElements (a.values,b.values),*a.vectorTemplate);
+ }
+
+diff --git a/src/num/aslFDAdvectionDiffusion.cxx b/src/num/aslFDAdvectionDiffusion.cxx
+index 4b7ae97..419c17f 100644
+--- a/src/num/aslFDAdvectionDiffusion.cxx
++++ b/src/num/aslFDAdvectionDiffusion.cxx
+@@ -202,7 +202,7 @@ namespace asl
+ void FDAdvectionDiffusion::setDistributionFunction(Field f)
+ {
+ if(f->getEContainer().size() != vectorTemplate->vectors.size())
+- errorMessage("FDAdvectionDiffusion::setDistributionFunction: the distrubution function has wrong number of components");
++ errorMessage("FDAdvectionDiffusion::setDistributionFunction: the distribution function has wrong number of components");
+ distributionFunction=f;
+ }
+
diff --git a/debian/patches/Replace-includes-math.h-cmath.patch b/debian/patches/Replace-includes-math.h-cmath.patch
deleted file mode 100644
index 4ebd0cf..0000000
--- a/debian/patches/Replace-includes-math.h-cmath.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-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/use-system-mathjax.patch b/debian/patches/Use-system-MathJax.patch
similarity index 54%
rename from debian/patches/use-system-mathjax.patch
rename to debian/patches/Use-system-MathJax.patch
index c6526ff..33e4a73 100644
--- a/debian/patches/use-system-mathjax.patch
+++ b/debian/patches/Use-system-MathJax.patch
@@ -1,11 +1,17 @@
-Description: use system mathjax instead of cdn
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Forwarded: not-needed
+From: Debian Science Maintainers
+ <debian-science-maintainers at lists.alioth.debian.org>
+Date: Wed, 23 Nov 2016 10:43:01 +0000
+Subject: Use system MathJax.
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ doc/Developer-Guide/Doxyfile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Developer-Guide/Doxyfile.in b/doc/Developer-Guide/Doxyfile.in
+index 0010512..585fdc7 100644
--- a/doc/Developer-Guide/Doxyfile.in
+++ b/doc/Developer-Guide/Doxyfile.in
-@@ -1527,7 +1527,7 @@
+@@ -1527,7 +1527,7 @@ MATHJAX_FORMAT = HTML-CSS
# The default value is: http://cdn.mathjax.org/mathjax/latest.
# This tag requires that the tag USE_MATHJAX is set to YES.
diff --git a/debian/patches/series b/debian/patches/series
index d4aa1a0..26f2de1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-use-system-mathjax.patch
-Replace-includes-math.h-cmath.patch
-Explicitly-define-namespace-of-ifstream-and-ofstream.patch
+Use-system-MathJax.patch
+Fix-spelling-errors-reported-by-Lintian.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git
More information about the debian-science-commits
mailing list