diff -Nru pdl-2.007/debian/changelog pdl-2.007/debian/changelog
--- pdl-2.007/debian/changelog	2014-12-17 10:02:50.000000000 +0000
+++ pdl-2.007/debian/changelog	2015-12-27 03:26:30.000000000 +0000
@@ -1,3 +1,12 @@
+pdl (1:2.007-4+rpi1) stretch-staging; urgency=medium
+
+  * Raspbian upload with changes taken from Bas Couwenberg's proposed patch
+    in Debian BTS.
+  * Update build dependencies for GSL 2, change libgsl0-dev to libgsl-dev.
+  * Add patch to fix FTBFS with GSL 2.x.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 27 Dec 2015 03:26:01 +0000
+
 pdl (1:2.007-4) unstable; urgency=high
 
   * Fix "problems upgrading from wheezy due to triggers"; print warning
diff -Nru pdl-2.007/debian/control pdl-2.007/debian/control
--- pdl-2.007/debian/control	2013-11-08 22:24:31.000000000 +0000
+++ pdl-2.007/debian/control	2015-12-27 03:24:49.000000000 +0000
@@ -11,7 +11,7 @@
  perl (>= 5.8.0-3),
  debhelper (>= 9),
  libinline-perl (>= 0.43),
- libgsl0-dev,
+ libgsl-dev,
  libxext-dev,
  libhdf4-alt-dev | libhdf4g-dev,
  libproj-dev | proj,
diff -Nru pdl-2.007/debian/patches/gsl-2.patch pdl-2.007/debian/patches/gsl-2.patch
--- pdl-2.007/debian/patches/gsl-2.patch	1970-01-01 00:00:00.000000000 +0000
+++ pdl-2.007/debian/patches/gsl-2.patch	2015-12-27 03:24:49.000000000 +0000
@@ -0,0 +1,44 @@
+Description: Add support for gsl_sf_ellint_D() call with GSL 2.x.
+Author: Sisyphus (http://sourceforge.net/u/userid-1195342/profile/)
+Origin: http://sourceforge.net/p/pdl/bugs/_discuss/thread/24953813/f256/attachment/gsl_sf_ellint.pd.diff
+Bug: http://sourceforge.net/p/pdl/bugs/407/
+Bug-Debian: https://bugs.debian.org/805824
+
+--- a/Lib/GSL/SF/ellint/gsl_sf_ellint.pd
++++ b/Lib/GSL/SF/ellint/gsl_sf_ellint.pd
+@@ -82,6 +82,10 @@ $e() = r.err;
+        Doc =>'Legendre form of incomplete elliptic integrals P(phi,k,n) = Integral[(1 + n Sin[t]^2)^(-1)/Sqrt[1 - k^2 Sin[t]^2], {t, 0, phi}]'
+       );
+ 
++my $v = `gsl-config --version`;
++
++if($v < 2.0) {
++
+ pp_def('gsl_sf_ellint_D',
+        GenericTypes => [D],
+        Pars=>'double phi(); double k(); double n();
+@@ -95,6 +99,24 @@ $e() = r.err;
+        Doc =>'Legendre form of incomplete elliptic integrals D(phi,k,n)'
+       );
+ 
++}
++else {
++
++pp_def('gsl_sf_ellint_D',
++       GenericTypes => [D],
++       Pars=>'double phi(); double k();
++              double [o]y(); double [o]e()',
++       Code =>'
++gsl_sf_result r;
++GSLERR(gsl_sf_ellint_D_e,($phi(),$k(),GSL_PREC_DOUBLE,&r))
++$y() = r.val;
++$e() = r.err; 
++',
++       Doc =>'Legendre form of incomplete elliptic integrals D(phi,k)'
++      );
++
++}
++
+ pp_def('gsl_sf_ellint_RC',
+        GenericTypes => [D],
+        Pars=>'double x(); double yy(); double [o]y(); double [o]e()',
diff -Nru pdl-2.007/debian/patches/series pdl-2.007/debian/patches/series
--- pdl-2.007/debian/patches/series	2014-09-25 06:15:31.000000000 +0000
+++ pdl-2.007/debian/patches/series	2015-12-27 03:24:49.000000000 +0000
@@ -8,3 +8,4 @@
 testsuite_fixes.patch
 slatec_default_integer_8.patch
 minuit_default_integer_8.patch
+gsl-2.patch