[Debian-astro-commits] [cpl-plugin-xsh] 01/01: Depend on gdl-2.1 and re-enable test_xsh_bspline

[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 db7577892bc3444bc7c98bf1246f985fa913e0fb
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Nov 26 08:48:45 2015 +0100

    Depend on gdl-2.1 and re-enable test_xsh_bspline
---
 debian/changelog          |  6 ++++++
 debian/control            |  2 +-
 debian/patches/gsl2.patch | 13 -------------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3c27fc..70866a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl-plugin-xshoo (2.6.8+dfsg-4) unstable; urgency=low
+
+  * Depend on gdl-2.1 and re-enable test_xsh_bspline
+
+ -- Ole Streicher <olebole at debian.org>  Thu, 26 Nov 2015 08:47:28 +0100
+
 cpl-plugin-xshoo (2.6.8+dfsg-3) unstable; urgency=medium
 
   * Provide gsl-2.0 compatibility. Closes: 804829
diff --git a/debian/control b/debian/control
index d1ea91e..ec04d53 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),
-               libgsl-dev (>= 2.0),
+               libgsl-dev (>= 2.1~),
 	       liblapack-dev,
                python,
                python-astropy,
diff --git a/debian/patches/gsl2.patch b/debian/patches/gsl2.patch
index 33247de..734c935 100644
--- a/debian/patches/gsl2.patch
+++ b/debian/patches/gsl2.patch
@@ -2,9 +2,6 @@ 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 @@
@@ -27,13 +24,3 @@ Description: Provide gsl-2.0 compatibility.
    
    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
- 

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