[SCM] postgis branch, master, updated. upstream/2.0.1-54-gde3f6c2

[Markus Wanner]

The following commit has been merged in the master branch:
commit de3f6c2ff8e5732af9870f6eda4d0d85f32f51fd
Author: Markus Wanner <markus at bluegap.ch>
Date:   Mon Jun 24 21:12:53 2013 +0200

    debian/control: add postgresql as a build dependency, so we can ..
    debian/rules: ... run unit and regression tests.

diff --git a/debian/control b/debian/control
index eb7b948..ef1a421 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
  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~),
- libgtk2.0-dev, libgdal1-dev (>= 1.6.0~), postgresql-server-dev-all
+ libgtk2.0-dev, libgdal1-dev (>= 1.6.0~), postgresql-server-dev-all,
+ postgresql
 Build-Depends-Indep: libpostgresql-jdbc-java, libsurefire-java,
  libmaven-clean-plugin-java, libmaven-compiler-plugin-java,
  libmaven-jar-plugin-java, libmaven-resources-plugin-java, maven2
diff --git a/debian/control.in b/debian/control.in
index 811d872..db1c499 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
  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~),
- libgtk2.0-dev, libgdal1-dev (>= 1.6.0~), postgresql-server-dev-all
+ libgtk2.0-dev, libgdal1-dev (>= 1.6.0~), postgresql-server-dev-all,
+ postgresql
 Build-Depends-Indep: libpostgresql-jdbc-java, libsurefire-java,
  libmaven-clean-plugin-java, libmaven-compiler-plugin-java,
  libmaven-jar-plugin-java, libmaven-resources-plugin-java, maven2
diff --git a/debian/rules b/debian/rules
index 8ef0ca3..f993dda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,11 @@ export DH_OPTIONS
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
+CHECK = check
+ifneq (,$(findstring nocheck,$(DEB_BUILLD_OPTIONS)))
+	CHECK =
+endif
+
 # Magic to automatically create a debian/control file for the (or all)
 # supported versions of Postgres.
 #
@@ -100,6 +105,11 @@ build-arch-stamp: configuration-stamp
 		$(MAKE) -C $(CURDIR)/debian/build-$$PGVER; \
 	done)
 
+#   Run unit tests (against the newest Postgres version only, for
+#   now).
+	test -z '$(CHECK)' || \
+		pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) make $(CHECK)
+
 	touch $@
 
 build-indep: build-indep-stamp
@@ -177,6 +187,10 @@ clean: debian/control
 		raster/rt_pg/rtpostgis_upgrade_cleanup.sql
 	rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0.install
 	rm -f $(CURDIR)/debian/postgresql-*-postgis-2.0-scripts.install
+
+	rm -f loader/cunit/cu_tester
+	rm -rf liblwgeom/cunit/.libs
+
 	dh_clean
 
 install: install-indep install-arch

-- 
PostGIS for PostgreSQL