[r-cran-gsl] 07/11: New upstream version working with gsl2

[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 20c73ae98eef1e2641d341acdb468fc12f6e10cd
Author: Andreas Tille <tille at debian.org>
Date:   Fri Dec 4 08:32:05 2015 +0000

    New upstream version working with gsl2
---
 debian/changelog          |  6 ++++--
 debian/patches/gsl2.patch | 34 ----------------------------------
 debian/patches/series     |  1 -
 3 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 73f5c61..d7f3fde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
-r-cran-gsl (1.9-10-2) UNRELEASED; urgency=medium
+r-cran-gsl (1.9-10.1-1) unstable; urgency=medium
 
   [ Bas Couwenberg ]
   * Update build dependencies for GSL 2, change libgsl0-dev to libgsl-dev
 
   [ Andreas Tille ]
+  * New upstream version
+    Closes: #805829
   * cme fix dpkg-control
 
- -- Andreas Tille <tille at debian.org>  Tue, 24 Nov 2015 21:34:13 +0100
+ -- Andreas Tille <tille at debian.org>  Fri, 04 Dec 2015 09:16:11 +0100
 
 r-cran-gsl (1.9-10-1) unstable; urgency=low
 
diff --git a/debian/patches/gsl2.patch b/debian/patches/gsl2.patch
deleted file mode 100644
index ed5deea..0000000
--- a/debian/patches/gsl2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 1e477c0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-gsl2.patch

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