This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository geos.
commit 2a64bb28fa0d838db7b5b524df67d0dbedc72796 Author: Bas Couwenberg <[email protected]> Date: Tue Oct 25 19:13:58 2016 +0200 Drop isnan patches, applied upstream. Refresh remaining patches. --- debian/changelog | 1 + debian/patches/gcc6-isnan.patch | 18 ------------------ debian/patches/libruby | 2 +- debian/patches/look-for-isnan-in-std-namespace.patch | 17 ----------------- debian/patches/ruby2 | 4 ++-- debian/patches/series | 2 -- debian/patches/spelling-errors.patch | 4 ++-- 7 files changed, 6 insertions(+), 42 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6f3b3bf..1c7e445 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ geos (3.6.0-1) UNRELEASED; urgency=medium * Drop ruby build dependency, pulled in via ruby-all-dev. * Update copyright file, changes: - Add Daniel Baston & Nyall Dawson to copyright holders + * Drop isnan patches, applied upstream. Refresh remaining patches. -- Bas Couwenberg <[email protected]> Tue, 25 Oct 2016 18:34:51 +0200 diff --git a/debian/patches/gcc6-isnan.patch b/debian/patches/gcc6-isnan.patch deleted file mode 100644 index 0076389..0000000 --- a/debian/patches/gcc6-isnan.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Use std::isnan for C++. - Based on: https://trac.osgeo.org/geos/changeset/4169/ -Author: Bas Couwenberg <[email protected]> -Bug-Debian: https://bugs.debian.org/831177 -Bug: https://trac.osgeo.org/geos/ticket/784 -Applied-Upstream: https://trac.osgeo.org/geos/changeset/4224 - ---- a/include/geos/platform.h.in -+++ b/include/geos/platform.h.in -@@ -86,7 +86,7 @@ extern "C" - #endif - - #if defined(HAVE_ISNAN) --# define ISNAN(x) (isnan(x)) -+# define ISNAN(x) (std::isnan(x)) - #else - # if defined(_MSC_VER) - # define ISNAN(x) _isnan(x) diff --git a/debian/patches/libruby b/debian/patches/libruby index 6767d7b..afe68f8 100644 --- a/debian/patches/libruby +++ b/debian/patches/libruby @@ -5,7 +5,7 @@ Forwarded: not-needed --- a/configure +++ b/configure -@@ -18564,7 +18564,7 @@ fi +@@ -18581,7 +18581,7 @@ fi RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["libdir"] || Config::CONFIG["libdir"]'` diff --git a/debian/patches/look-for-isnan-in-std-namespace.patch b/debian/patches/look-for-isnan-in-std-namespace.patch deleted file mode 100644 index c85ac9f..0000000 --- a/debian/patches/look-for-isnan-in-std-namespace.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Look for isnan in std:: namespace. - Tested with gcc 4.8.4 -Author: Sandro Santilli <[email protected]> -Origin: https://trac.osgeo.org/geos/changeset/4169/ -Bug-Debian: https://bugs.debian.org/831177 - ---- a/configure.ac -+++ b/configure.ac -@@ -197,7 +197,7 @@ dnl of isnan(). - AC_LANG_PUSH([C++]) - AC_CACHE_CHECK([for isnan], ac_cv_isnan, - [AC_TRY_LINK([#include <cmath>], -- [double x; int y; y = isnan(x);], -+ [double x; int y; y = std::isnan(x);], - ac_cv_isnan=yes, - ac_cv_isnan=no - )]) diff --git a/debian/patches/ruby2 b/debian/patches/ruby2 index fccb58b..cc72125 100644 --- a/debian/patches/ruby2 +++ b/debian/patches/ruby2 @@ -4,7 +4,7 @@ Forwarded: https://trac.osgeo.org/geos/ticket/742 --- a/configure +++ b/configure -@@ -18558,12 +18558,16 @@ fi +@@ -18575,12 +18575,16 @@ fi RUBY_BIN_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["bindir"] || Config::CONFIG["bindir"]'` @@ -93,7 +93,7 @@ Forwarded: https://trac.osgeo.org/geos/ticket/742 --- a/swig/ruby/Makefile.in +++ b/swig/ruby/Makefile.in -@@ -446,18 +446,18 @@ MAINTAINERCLEANFILES = geos_wrap.cxx +@@ -444,18 +444,18 @@ MAINTAINERCLEANFILES = geos_wrap.cxx @ENABLE_RUBY_TRUE@rubyextensiondirdir = $(RUBY_EXTENSION_DIR) # Setup includes diff --git a/debian/patches/series b/debian/patches/series index 81d8d17..b70acfb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,5 +3,3 @@ libruby ruby2 disable-docygen-html-timestamp spelling-errors.patch -look-for-isnan-in-std-namespace.patch -gcc6-isnan.patch diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch index 2453d43..e611149 100644 --- a/debian/patches/spelling-errors.patch +++ b/debian/patches/spelling-errors.patch @@ -5,8 +5,8 @@ Forwarded: https://trac.osgeo.org/geos/ticket/773 --- a/capi/geos_ts_c.cpp +++ b/capi/geos_ts_c.cpp -@@ -6428,7 +6428,7 @@ GEOSVoronoiDiagram_r(GEOSContextHandle_t - } +@@ -6792,7 +6792,7 @@ GEOSVoronoiDiagram_r(GEOSContextHandle_t + } catch(...) { - handle->ERROR_MESSAGE("Unknow exception thrown"); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geos.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
