[pdl] 04/09: Add Patch by Sebastiaan Couwenberg to fix libgsl issue

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository pdl.

commit 7210815e55ecc18e6022c6bd060401dd00c62f12
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jan 15 13:42:35 2016 +0100

    Add Patch by Sebastiaan Couwenberg to fix libgsl issue
---
 debian/changelog           |  7 +++++++
 debian/control             |  2 +-
 debian/patches/gsl-2.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b34bb76..900376b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 pdl (1:2.007-5) UNRELEASED; urgency=medium
 
   * Team upload.
+  
+  [ Andreas Tille ]
   * Package migrated to Debian Science team Git as Uploader Henning Glawe agreed
   * Add watch file
 
+  [ Sebastiaan Couwenberg ]
+  * Update build dependencies for GSL 2, change libgsl0-dev to libgsl-dev.
+  * Add patch to fix FTBFS with GSL 2.x.
+    Closes: #805824
+
  -- Andreas Tille <tille at debian.org>  Fri, 15 Jan 2016 13:27:04 +0100
 
 pdl (1:2.007-4) unstable; urgency=high
diff --git a/debian/control b/debian/control
index c207b5e..897afb0 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  perl (>= 5.8.0-3),
  debhelper (>= 9),
  libinline-perl (>= 0.43),
- libgsl0-dev,
+ libgsl-dev,
  libxext-dev,
  libhdf4-alt-dev | libhdf4g-dev,
  libproj-dev | proj,
diff --git a/debian/patches/gsl-2.patch b/debian/patches/gsl-2.patch
new file mode 100644
index 0000000..d3e1853
--- /dev/null
+++ b/debian/patches/gsl-2.patch
@@ -0,0 +1,44 @@
+Description: Add support for gsl_sf_ellint_D() call with GSL 2.x.
+Author: Sisyphus (http://sourceforge.net/u/userid-1195342/profile/)
+Origin: http://sourceforge.net/p/pdl/bugs/_discuss/thread/24953813/f256/attachment/gsl_sf_ellint.pd.diff
+Bug: http://sourceforge.net/p/pdl/bugs/407/
+Bug-Debian: https://bugs.debian.org/805824
+
+--- a/Lib/GSL/SF/ellint/gsl_sf_ellint.pd
++++ b/Lib/GSL/SF/ellint/gsl_sf_ellint.pd
+@@ -82,6 +82,10 @@ $e() = r.err;
+        Doc =>'Legendre form of incomplete elliptic integrals P(phi,k,n) = Integral[(1 + n Sin[t]^2)^(-1)/Sqrt[1 - k^2 Sin[t]^2], {t, 0, phi}]'
+       );
+ 
++my $v = `gsl-config --version`;
++
++if($v < 2.0) {
++
+ pp_def('gsl_sf_ellint_D',
+        GenericTypes => [D],
+        Pars=>'double phi(); double k(); double n();
+@@ -95,6 +99,24 @@ $e() = r.err;
+        Doc =>'Legendre form of incomplete elliptic integrals D(phi,k,n)'
+       );
+ 
++}
++else {
++
++pp_def('gsl_sf_ellint_D',
++       GenericTypes => [D],
++       Pars=>'double phi(); double k();
++              double [o]y(); double [o]e()',
++       Code =>'
++gsl_sf_result r;
++GSLERR(gsl_sf_ellint_D_e,($phi(),$k(),GSL_PREC_DOUBLE,&r))
++$y() = r.val;
++$e() = r.err; 
++',
++       Doc =>'Legendre form of incomplete elliptic integrals D(phi,k)'
++      );
++
++}
++
+ pp_def('gsl_sf_ellint_RC',
+        GenericTypes => [D],
+        Pars=>'double x(); double yy(); double [o]y(); double [o]e()',
diff --git a/debian/patches/series b/debian/patches/series
index 563575e..7880ecb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ fix_manifest.patch
 testsuite_fixes.patch
 slatec_default_integer_8.patch
 minuit_default_integer_8.patch
+gsl-2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pdl.git