This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository imposm.
commit 6565d5512dbbd1e466322e86a0f78f7bfa8a6d11
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Mon Aug 31 14:17:21 2015 +0200
Add patch to fix Shapely geos_capi_version check.
---
debian/changelog | 1 +
debian/patches/geos-capi-version.patch | 18 ++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 20 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index cd1ed07..cda8e6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ imposm (2.6.0+ds-1) UNRELEASED; urgency=medium
* Repack upstream tarball to exclude .egg-info directory.
* Add build dependencies for tests: python-shapely.
* Override dh_auto_test to ignore test failures.
+ * Add patch to fix Shapely geos_capi_version check.
-- Bas Couwenberg <sebas...@debian.org> Mon, 31 Aug 2015 13:40:19 +0200
diff --git a/debian/patches/geos-capi-version.patch
b/debian/patches/geos-capi-version.patch
new file mode 100644
index 0000000..fcef0ac
--- /dev/null
+++ b/debian/patches/geos-capi-version.patch
@@ -0,0 +1,18 @@
+Description: Disable failing geos_capi_version check.
+ The minimum required GEOS version is in Debian.
+Author: Bas Couwenberg <sebas...@debian.org>
+
+--- a/imposm/geom.py
++++ b/imposm/geom.py
+@@ -48,7 +48,10 @@ TOLERANCE_DEEGREES = 1e-8
+ TOLERANCE_METERS = 1e-3
+
+ # older versions had unhandled floating point execptions in .buffer(0)
+-SHAPELY_SUPPORTS_BUFFER = shapely.geos.geos_capi_version >= (1, 6, 0)
++#SHAPELY_SUPPORTS_BUFFER = shapely.geos.geos_capi_version >= (1, 6, 0)
++# The geos_capi_version check fails with Shapely 1.5.12 & GEOS 3.5.0,
++# GEOS >= 3.1.1 has CAPI >= 1.6.0 and that's been in Debian for a while.
++SHAPELY_SUPPORTS_BUFFER = True
+
+ def validate_and_simplify(geom, meter_units=False):
+ if SHAPELY_SUPPORTS_BUFFER:
diff --git a/debian/patches/series b/debian/patches/series
index d2a6d63..a1da294 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
00-fix_sql_path.patch
+geos-capi-version.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/imposm.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
