diff -Nru voxbo-1.8.5~svn1246/debian/changelog voxbo-1.8.5~svn1246/debian/changelog
--- voxbo-1.8.5~svn1246/debian/changelog	2014-07-25 00:35:59.000000000 +0000
+++ voxbo-1.8.5~svn1246/debian/changelog	2015-12-27 18:48:18.000000000 +0000
@@ -1,3 +1,12 @@
+voxbo (1.8.5~svn1246-1.1+rpi1) stretch-staging; urgency=medium
+
+  [Fixes taken from ubuntu version 1.8.5~svn1246-1.1ubuntu1 by Iain Lane]
+  * Fix FTBFS due to changed gsl_multifit_fdfsolver API
+  * Rebuild against new gsl. Update references to libgsl0-dev to libgsl-
+    dev.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 27 Dec 2015 18:47:53 +0000
+
 voxbo (1.8.5~svn1246-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru voxbo-1.8.5~svn1246/debian/control voxbo-1.8.5~svn1246/debian/control
--- voxbo-1.8.5~svn1246/debian/control	2014-07-25 00:35:59.000000000 +0000
+++ voxbo-1.8.5~svn1246/debian/control	2015-11-10 15:02:13.000000000 +0000
@@ -2,7 +2,7 @@
 Priority: extra
 Maintainer: NeuroDebian Team <team@neuro.debian.net>
 Uploaders: Michael Hanke <mih@debian.org>, Yaroslav Halchenko <debian@onerussian.com>
-Build-Depends: debhelper (>= 7.0.50~), python, zlib1g-dev, libboost-dev, libboost-thread-dev, libgsl0-dev, libpng-dev, libqt4-dev, libxi-dev, libxrender-dev, libfontconfig1-dev | libfontconfig-dev
+Build-Depends: debhelper (>= 7.0.50~), python, zlib1g-dev, libboost-dev, libboost-thread-dev, libgsl-dev, libpng-dev, libqt4-dev, libxi-dev, libxrender-dev, libfontconfig1-dev | libfontconfig-dev
 Standards-Version: 3.9.1
 Section: science
 Homepage: http://www.voxbo.org
diff -Nru voxbo-1.8.5~svn1246/debian/patches/gsl-2.0-ftbfs voxbo-1.8.5~svn1246/debian/patches/gsl-2.0-ftbfs
--- voxbo-1.8.5~svn1246/debian/patches/gsl-2.0-ftbfs	1970-01-01 00:00:00.000000000 +0000
+++ voxbo-1.8.5~svn1246/debian/patches/gsl-2.0-ftbfs	2015-11-10 17:07:11.000000000 +0000
@@ -0,0 +1,26 @@
+Index: b/utils/fitOneOverF.cpp
+===================================================================
+--- a/utils/fitOneOverF.cpp
++++ b/utils/fitOneOverF.cpp
+@@ -202,7 +202,9 @@
+   }
+   while (status == GSL_CONTINUE && iter < 500);
+ 
+-  gsl_multifit_covar (s->J, 0.0, covar);
++  gsl_matrix *J = gsl_matrix_alloc (s->fdf->n, s->fdf->p);
++  gsl_multifit_fdfsolver_jac (s, J);
++  gsl_multifit_covar (J, 0.0, covar);
+ 
+ #define FIT(i) gsl_vector_get(s->x, i)
+ #define ERR(i) sqrt(gsl_matrix_get(covar, i, i))
+@@ -395,7 +397,9 @@
+   }
+   while (status == GSL_CONTINUE && iter < 500);
+ 
+-  gsl_multifit_covar (s->J, 0.0, covar);
++  gsl_matrix *J = gsl_matrix_alloc (s->fdf->n, s->fdf->p);
++  gsl_multifit_fdfsolver_jac (s, J);
++  gsl_multifit_covar (J, 0.0, covar);
+ 
+ #define FIT(i) gsl_vector_get(s->x, i)
+ #define ERR(i) sqrt(gsl_matrix_get(covar, i, i))
diff -Nru voxbo-1.8.5~svn1246/debian/patches/series voxbo-1.8.5~svn1246/debian/patches/series
--- voxbo-1.8.5~svn1246/debian/patches/series	2014-07-25 00:35:59.000000000 +0000
+++ voxbo-1.8.5~svn1246/debian/patches/series	2015-11-10 17:05:50.000000000 +0000
@@ -1,3 +1,4 @@
 no_qtimageformats_linking
 manpages
 fix-linking.patch
+gsl-2.0-ftbfs