[asymptote] 02/02: add upstream patch to support gsl2 (Closes: #805749)
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository asymptote.
commit a4c2446b1a895cbd7e1e5ad10781825499f8c182
Author: Norbert Preining <norbert@preining.info>
Date: Tue Nov 24 15:15:25 2015 +0900
add upstream patch to support gsl2 (Closes: #805749)
---
debian/changelog | 7 ++++---
debian/patches/series | 1 +
debian/patches/upstream-gsl2 | 27 +++++++++++++++++++++++++++
3 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index aa8450f..9ab2121 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-asymptote (2.35-3~1) UNRELEASED; urgency=medium
+asymptote (2.35-3) unstable; urgency=medium
- * switch to libgsl-dev for build-deps (Closes: #805749)
+ * switch to libgsl-dev for build-deps
+ * add upstream patch to support gsl2 (Closes: #805749)
- -- Norbert Preining <preining@debian.org> Tue, 24 Nov 2015 14:53:30 +0900
+ -- Norbert Preining <preining@debian.org> Tue, 24 Nov 2015 15:14:40 +0900
asymptote (2.35-2) unstable; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 9285272..f959a4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0002-update-documentation-for-debian-specific-parts.patch
fix-docstring-backslash
#old-gs-use-epswrite
+upstream-gsl2
diff --git a/debian/patches/upstream-gsl2 b/debian/patches/upstream-gsl2
new file mode 100644
index 0000000..4e7ca46
--- /dev/null
+++ b/debian/patches/upstream-gsl2
@@ -0,0 +1,27 @@
+Patch from upstream John Bowman to support gsl 2.0
+---
+ gsl.cc | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- asymptote.orig/gsl.cc
++++ asymptote/gsl.cc
+@@ -27,6 +27,7 @@
+ #include <gsl/gsl_rng.h>
+ #include <gsl/gsl_randist.h>
+ #include <gsl/gsl_cdf.h>
++#include <gsl/gsl_version.h>
+
+ #include "opsymbols.h"
+
+@@ -1088,7 +1089,11 @@
+ addGSLDOUBLE2Func<gsl_sf_ellint_F>(SYM(F));
+ addGSLDOUBLE2Func<gsl_sf_ellint_E>(SYM(E));
+ addGSLDOUBLE3Func<gsl_sf_ellint_P>(SYM(P),SYM(phi),SYM(k),SYM(n));
++#if GSL_MAJOR_VERSION >= 2
++ addGSLDOUBLE2Func<gsl_sf_ellint_D>(SYM(D),SYM(phi),SYM(k));
++#else
+ addGSLDOUBLE3Func<gsl_sf_ellint_D>(SYM(D),SYM(phi),SYM(k),SYM(n));
++#endif
+ addGSLDOUBLE2Func<gsl_sf_ellint_RC>(SYM(RC),SYM(x),SYM(y));
+ addGSLDOUBLE3Func<gsl_sf_ellint_RD>(SYM(RD),SYM(x),SYM(y),SYM(z));
+ addGSLDOUBLE3Func<gsl_sf_ellint_RF>(SYM(RF),SYM(x),SYM(y),SYM(z));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/asymptote.git
Reply to: