[SCM] postgis branch, master, updated. upstream/2.0.1-59-g07bcd4b

[Markus Wanner]

The following commit has been merged in the master branch:
commit 07bcd4b62e1fb5b0c8f9853d72fee5a46e771bbd
Author: Markus Wanner <markus at bluegap.ch>
Date:   Thu Jul 18 19:14:46 2013 +0200

    Pass an LD_PRELOAD to postgres when running 'make check', so the
    postgis library being loaded can find liblwgeom (and doesn't try to
    use a pre-installed one).
    
    Add postgresql-common build dependency, as the above needs a relatively
    new pg_createcluster feature.

diff --git a/debian/changelog b/debian/changelog
index facd980..5928fdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ postgis (2.0.3-2) UNRELEASED; urgency=low
   * Tweak extend-diff-ignore to save us a copying dance in
     debian/rules. Cleanup the 'clean' target a bit.
   * Make maven2 a full build-dep (not just B-D-Indep). Closes: #714712.
+  * Pass an LD_PRELOAD to postgres when running 'make check', so the
+    postgis library being loaded can find liblwgeom (and doesn't try to
+    use a pre-installed one).
+  * Add postgresql-common build dependency, as the above needs a relatively
+    new pg_createcluster feature.
   * Drop libpostgresql-jdbc-java from B-D-I, it's already in B-D.
 
  -- Markus Wanner <markus at bluegap.ch>  Fri, 14 Jun 2013 13:08:58 +0200
diff --git a/debian/control b/debian/control
index 960d120..dab471d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
  default-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7),
  imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
  libgtk2.0-dev, libgdal-dev (>= 1.6.0~) | libgdal1-dev (>= 1.6.0~),
- maven2, postgresql-server-dev-all, postgresql
+ maven2, postgresql-server-dev-all, postgresql, postgresql-common (>= 146)
 Build-Depends-Indep: libsurefire-java,
  libmaven-clean-plugin-java, libmaven-compiler-plugin-java,
  libmaven-jar-plugin-java, libmaven-resources-plugin-java
diff --git a/debian/control.in b/debian/control.in
index d22b636..6c0d091 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
  default-jdk, libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7),
  imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
  libgtk2.0-dev, libgdal-dev (>= 1.6.0~) | libgdal1-dev (>= 1.6.0~),
- maven2, postgresql-server-dev-all, postgresql
+ maven2, postgresql-server-dev-all, postgresql, postgresql-common (>= 146)
 Build-Depends-Indep: libsurefire-java,
  libmaven-clean-plugin-java, libmaven-compiler-plugin-java,
  libmaven-jar-plugin-java, libmaven-resources-plugin-java
diff --git a/debian/rules b/debian/rules
index 6f2ee17..057bc40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,8 +94,11 @@ build-arch-stamp: configuration-stamp
 
 #   Run unit tests (against the newest Postgres version only, for
 #   now).
+	echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-2.0.3.so'" \
+		> $(CURDIR)/postgis-check-env.tmp
 	test -z '$(CHECK)' || \
-		pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) make $(CHECK)
+		pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \
+			-c '--environment $(CURDIR)/postgis-check-env.tmp' make check
 
 	touch $@
 
@@ -174,6 +177,9 @@ clean: debian/control
 	rm -f loader/cunit/cu_tester
 	rm -rf liblwgeom/cunit/.libs
 
+#	Cleanup the temporary environment file.
+	rm -f postgis-check-env.tmp
+
 	dh_clean
 
 install: install-indep install-arch
@@ -242,8 +248,13 @@ install-arch: build-arch
 
 	dh_install -s
 
-check: install-arch
-	$(MAKE) check
+check: build-arch
+#   Run unit tests (against the newest Postgres version only, for
+#   now).
+	echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-2.0.3.so'" \
+		> $(CURDIR)/postgis-check-env.tmp
+	pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \
+		-c '--environment $(CURDIR)/postgis-check-env.tmp' make check
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep

-- 
PostGIS for PostgreSQL