[Debian-astro-commits] [cpl-plugin-xsh] 02/02: Adjust patches for new version

[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 64a250973ec3dc7598961855868af169a81c4da0
Author: Ole Streicher <ole at aip.de>
Date:   Wed Apr 20 12:24:45 2016 +0200

    Adjust patches for new version
---
 debian/changelog                                   |  6 +++++
 .../patches/fix_implicitpointerconversions.patch   | 14 ------------
 debian/patches/gsl2.patch                          | 26 ----------------------
 debian/patches/series                              |  2 --
 4 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 70866a4..a364b38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl-plugin-xshoo (2.7.1+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <olebole at debian.org>  Wed, 20 Apr 2016 12:21:45 +0200
+
 cpl-plugin-xshoo (2.6.8+dfsg-4) unstable; urgency=low
 
   * Depend on gdl-2.1 and re-enable test_xsh_bspline
diff --git a/debian/patches/fix_implicitpointerconversions.patch b/debian/patches/fix_implicitpointerconversions.patch
deleted file mode 100644
index 94af989..0000000
--- a/debian/patches/fix_implicitpointerconversions.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Include header file with needed declarations
- This header file contains the declarations of xsh_frameset_mflat_divide()
- and xsh_frameset_crh_single().
---- a/recipes/xsh_util_ifu_offset.c
-+++ b/recipes/xsh_util_ifu_offset.c
-@@ -58,6 +58,7 @@
- #include <xsh_model_io.h>
- #include <xsh_model_utils.h>
- #include <xsh_utils_ifu.h>
-+#include <xsh_utils_scired_slit.h>
- #include <xsh_model_arm_constants.h>
- /* DRL functions */
- #include <xsh_drl.h>
diff --git a/debian/patches/gsl2.patch b/debian/patches/gsl2.patch
deleted file mode 100644
index 734c935..0000000
--- a/debian/patches/gsl2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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.
---- 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);
diff --git a/debian/patches/series b/debian/patches/series
index 46f9c83..cdb741b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,3 @@ lapack.patch
 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