[r-cran-gsl] 06/11: Try to enable gsl2 but the C code needs adaption

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository r-cran-gsl.

commit b580d44a79cd24962133974f6c4baef4fe169777
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 24 21:11:14 2015 +0000

    Try to enable gsl2 but the C code needs adaption
---
 debian/patches/gsl2.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series     |  1 +
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/gsl2.patch b/debian/patches/gsl2.patch
new file mode 100644
index 0000000..ed5deea
--- /dev/null
+++ b/debian/patches/gsl2.patch
@@ -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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1e477c0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gsl2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-gsl.git