diff -Nru kst-2.0.3/debian/changelog kst-2.0.3/debian/changelog --- kst-2.0.3/debian/changelog 2015-05-08 09:12:13.000000000 +0000 +++ kst-2.0.3/debian/changelog 2015-12-26 13:53:24.000000000 +0000 @@ -1,3 +1,12 @@ +kst (2.0.3-4+rpi1) stretch-staging; urgency=medium + + [Changes by Ian lane taken from ubuntu version 2.0.3-4ubuntu1] + * Rebuild against new gsl. Update references to libgsl0-dev to libgsl- + dev. + * Fix FTBFS due to changed gsl_multifit_covar. + + -- Peter Michael Green Thu, 24 Dec 2015 19:38:55 +0000 + kst (2.0.3-4) unstable; urgency=medium * QA upload. diff -Nru kst-2.0.3/debian/control kst-2.0.3/debian/control --- kst-2.0.3/debian/control 2015-05-08 02:39:22.000000000 +0000 +++ kst-2.0.3/debian/control 2015-12-24 19:40:37.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Debian QA Group Build-Depends: debhelper (>= 9), cmake (>=2.8), libqt4-dev (>= 4.5), libqt4-opengl-dev (>= 4.5), - libgsl0-dev, libnetcdf-dev, libcfitsio-dev, libgetdata-dev, + libgsl-dev, libnetcdf-dev, libcfitsio-dev, libgetdata-dev, xsltproc, docbook-xsl Standards-Version: 3.9.3 Homepage: http://kst.kde.org diff -Nru kst-2.0.3/debian/patches/gsl-2.0-ftbfs kst-2.0.3/debian/patches/gsl-2.0-ftbfs --- kst-2.0.3/debian/patches/gsl-2.0-ftbfs 1970-01-01 00:00:00.000000000 +0000 +++ kst-2.0.3/debian/patches/gsl-2.0-ftbfs 2015-11-10 17:24:11.000000000 +0000 @@ -0,0 +1,30 @@ +Index: b/src/plugins/fits/non_linear.h +=================================================================== +--- a/src/plugins/fits/non_linear.h ++++ b/src/plugins/fits/non_linear.h +@@ -179,7 +179,9 @@ + } + while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); + +- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); ++ gsl_matrix *J = gsl_matrix_alloc (pSolver->fdf->n, pSolver->fdf->p); ++ gsl_multifit_fdfsolver_jac (pSolver, J); ++ gsl_multifit_covar (J, 0.0, pMatrixCovariance); + + // + // determine the fitted values... +Index: b/src/plugins/fits/non_linear_weighted.h +=================================================================== +--- a/src/plugins/fits/non_linear_weighted.h ++++ b/src/plugins/fits/non_linear_weighted.h +@@ -193,7 +193,9 @@ + } + while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); + +- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); ++ gsl_matrix *J = gsl_matrix_alloc (pSolver->fdf->n, pSolver->fdf->p); ++ gsl_multifit_fdfsolver_jac (pSolver, J); ++ gsl_multifit_covar (J, 0.0, pMatrixCovariance); + + // + // determine the fitted values... diff -Nru kst-2.0.3/debian/patches/series kst-2.0.3/debian/patches/series --- kst-2.0.3/debian/patches/series 2014-08-13 21:30:22.000000000 +0000 +++ kst-2.0.3/debian/patches/series 2015-11-10 17:22:25.000000000 +0000 @@ -3,3 +3,4 @@ hyphen-used-as-minus-sign.diff fix-qreal-vs-double-for-arm.diff fix-cmake-3.0.diff +gsl-2.0-ftbfs