[Debian-astro-commits] [cpl-plugin-xsh] 01/01: Provide gsl-2.0 compatibility. Closes: 804829 Also, temporarily disable test_xsh_bspline to workaround a gsl-2 bug: http://savannah.gnu.org/bugs/?46370

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository cpl-plugin-xsh.

commit c3cfa21e6c35c8db0b64be46a6112fedbbe507d7
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Nov 12 10:38:59 2015 +0100

    Provide gsl-2.0 compatibility. Closes: 804829
    Also, temporarily disable test_xsh_bspline to workaround a gsl-2 bug:
    http://savannah.gnu.org/bugs/?46370
---
 debian/changelog          |  7 +++++++
 debian/control            |  2 +-
 debian/patches/gsl2.patch | 39 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series     |  1 +
 4 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c67da27..e3c27fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cpl-plugin-xshoo (2.6.8+dfsg-3) unstable; urgency=medium
+
+  * Provide gsl-2.0 compatibility. Closes: 804829
+  * Temporarily disable test_xsh_bspline to workaround a gsl-2 bug
+
+ -- Ole Streicher <olebole at debian.org>  Thu, 12 Nov 2015 09:43:27 +0100
+
 cpl-plugin-xshoo (2.6.8+dfsg-2) unstable; urgency=low
 
   * Fix ImplicitPointerConversion
diff --git a/debian/control b/debian/control
index 8989155..d1ea91e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Ole Streicher <olebole at debian.org>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                libcpl-dev (>= 5.3.1),
-               libgsl0-dev,
+               libgsl-dev (>= 2.0),
 	       liblapack-dev,
                python,
                python-astropy,
diff --git a/debian/patches/gsl2.patch b/debian/patches/gsl2.patch
new file mode 100644
index 0000000..33247de
--- /dev/null
+++ b/debian/patches/gsl2.patch
@@ -0,0 +1,39 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Provide gsl-2.0 compatibility.
+ The Jacobi matix is no longer part of the multifit_fdsolver structure;
+ instead it needs to be handled separately.
+ .
+ The test_xsh_bspline test is now tempoarily disables since it fails on a GSL
+ bug: http://savannah.gnu.org/bugs/?46370
+--- a/xsh/xsh_utils.c
++++ b/xsh/xsh_utils.c
+@@ -6844,6 +6844,7 @@
+   int iter = 0;
+   const size_t p = 6;
+   gsl_matrix *covar = gsl_matrix_alloc (p, p);
++  gsl_matrix *J;
+   int n=0;
+   struct data d = { n, NULL, NULL,deg};
+   gsl_multifit_function_fdf f;
+@@ -6933,7 +6934,10 @@
+   }
+   while ( *status == GSL_CONTINUE && iter < 500);
+   
+-  gsl_multifit_covar (s->J, 0.0, covar);
++  J = gsl_matrix_alloc(n, p);
++  gsl_multifit_fdfsolver_jac(s, J);
++  gsl_multifit_covar (J, 0.0, covar);
++  gsl_matrix_free (J);
+   
+   params[0] = gsl_vector_get( s->x, 0);
+   params[1] = gsl_vector_get( s->x, 1);
+--- a/xsh/tests/Makefile.am
++++ b/xsh/tests/Makefile.am
+@@ -483,7 +483,6 @@
+   test_xsh_xcorrel_gaussians \
+   test_xsh_correct_vacuum_to_air \
+   test_xsh_telluric_cor \
+-  test_xsh_bspline \
+   test_xsh_dfs_sdp \
+   test_spectrum_stat
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e0d0609..46f9c83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ force-serial-tests.patch
 add_cpldrs.patch
 fix_hdr_endianess_fail.patch
 fix_implicitpointerconversions.patch
+gsl2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-xsh.git