The following commit has been merged in the master branch:
commit b03bb90f3762cbbf27935660f46a1024ac38faf5
Author: Markus Wanner <mar...@bluegap.ch>
Date: Thu Jul 18 19:02:13 2013 +0200
Increase version requirement on libgeos-dev back to >= 3.3, effectively
reverting 43bd658f.
diff --git a/debian/changelog b/debian/changelog
index 932c153..e836c0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,6 @@ postgis (2.0.3-2) UNRELEASED; urgency=low
libgdal1-dev to satisfy it as well.
* Build-Deps: correct libgeos-dev version requirement, depend on
libpostgresql-jdbc-java instead of (transitional) libpg-java.
- * Lower dependency on libgeos-dev to 3.2.2 and instead dynamically
- disable topology support, if GEOS is not new enough - for
- backportability.
* Tweak extend-diff-ignore to save us a copying dance in
debian/rules. Cleanup the 'clean' target a bit.
diff --git a/debian/control b/debian/control
index da11a8a..114709c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project
<pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Stephen Frost <sfr...@debian.org>, Francesco Paolo
Lovergine <fran...@debian.org>, Markus Wanner <mar...@bluegap.ch>
Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
- flex, bison, libgeos-dev (>= 3.2.2~), libjson0-dev (>= 0.9~),
+ flex, bison, libgeos-dev (>= 3.3), libjson0-dev (>= 0.9~),
libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl,
default-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7),
imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
diff --git a/debian/control.in b/debian/control.in
index c9f7812..877f67a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project
<pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Stephen Frost <sfr...@debian.org>, Francesco Paolo
Lovergine <fran...@debian.org>, Markus Wanner <mar...@bluegap.ch>
Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
- flex, bison, libgeos-dev (>= 3.2.2~), libjson0-dev (>= 0.9~),
+ flex, bison, libgeos-dev (>= 3.3), libjson0-dev (>= 0.9~),
libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl,
default-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7),
imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
diff --git a/debian/rules b/debian/rules
index 1751d68..6f2ee17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,19 +78,6 @@ COMMON_CONFIGURE_ARGS = --host=$(DEB_HOST_GNU_TYPE) \
--infodir=\$${prefix}/share/info \
--with-gui
-# Retrieve the version of the GEOS library installed.
-GEOS_VERSION = $(shell geos-config --version)
-
-# Depending on that, we either request or disable topology support.
-ENABLE_TOPOLOGY = $(shell dpkg --compare-versions \
- $(GEOS_VERSION) ge 3.3.2 && echo "yes")
-
-ifeq ($(ENABLE_TOPOLOGY),yes)
- COMMON_CONFIGURE_ARGS += --with-topology
-else
- COMMON_CONFIGURE_ARGS += --without-topology
-endif
-
build: build-arch build-indep
build-arch: build-arch-stamp
--
PostGIS for PostgreSQL
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
