r47186 - in /packages/R/r-cran-gsl/trunk/debian/patches: ./ gsl2.patch series

[tille at users.alioth.debian.org]

Author: tille
Date: Tue Nov 24 21:11:14 2015
New Revision: 47186

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47186
Log:
Try to enable gsl2 but the C code needs adaption

Added:
    packages/R/r-cran-gsl/trunk/debian/patches/
    packages/R/r-cran-gsl/trunk/debian/patches/gsl2.patch
    packages/R/r-cran-gsl/trunk/debian/patches/series

Added: packages/R/r-cran-gsl/trunk/debian/patches/gsl2.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-gsl/trunk/debian/patches/gsl2.patch?rev=47186&op=file
==============================================================================
--- packages/R/r-cran-gsl/trunk/debian/patches/gsl2.patch	(added)
+++ packages/R/r-cran-gsl/trunk/debian/patches/gsl2.patch	Tue Nov 24 21:11:14 2015
@@ -0,0 +1,34 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 24 Nov 2015 21:34:13 +0100
+Description: Enable building with gsl 2.x
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,11 @@ int main() {
+    if ((sscanf(gslv, "%d.%d", &major, &minor)) != 2) {
+      exit (1);
+    }
+-   exit (minor < 12);
++   if (major >= 2 ) {
++     exit (0);
++   } else {
++     exit (minor < 12);
++   }
+ #else
+   exit(1);
+ #endif
+--- a/configure
++++ b/configure
+@@ -2635,7 +2635,11 @@ int main() {
+    if ((sscanf(gslv, "%d.%d", &major, &minor)) != 2) {
+      exit (1);
+    }
+-   exit (minor < 12);
++   if (major >= 2 ) {
++     exit (0);
++   } else {
++     exit (minor < 12);
++   }
+ #else
+   exit(1);
+ #endif

Added: packages/R/r-cran-gsl/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/R/r-cran-gsl/trunk/debian/patches/series?rev=47186&op=file
==============================================================================
--- packages/R/r-cran-gsl/trunk/debian/patches/series	(added)
+++ packages/R/r-cran-gsl/trunk/debian/patches/series	Tue Nov 24 21:11:14 2015
@@ -0,0 +1 @@
+gsl2.patch