[SCM] postgis branch, master, updated. upstream/2.0.1-65-g6601ee7

Markus Wanner markus at bluegap.ch
Fri Jul 26 13:31:28 UTC 2013


The following commit has been merged in the master branch:
commit 6601ee78bae102748aa7abd9d507aae624185c3d
Author: Markus Wanner <markus at bluegap.ch>
Date:   Thu Jul 25 21:58:23 2013 +0200

    * Build-Deps: rather than default-jdk, depend on openjdk 6 or 7, as the
      gcj-jdk didn't work.
    * Add patch fix-kfreebsd to get rid of a compilation error on kFreeBSD.
    * rules: if 'make check' fails, print all the diffs of failing tests on
      stdout.

diff --git a/debian/changelog b/debian/changelog
index 4406761..b640c7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+postgis (2.0.3-5) unstable; urgency=low
+
+  * Build-Deps: rather than default-jdk, depend on openjdk 6 or 7, as the
+    gcj-jdk didn't work.
+  * Add patch fix-kfreebsd to get rid of a compilation error on kFreeBSD.
+  * rules: if 'make check' fails, print all the diffs of failing tests on
+    stdout.
+
+ -- Markus Wanner <markus at bluegap.ch>  Thu, 25 Jul 2013 21:45:17 +0200
+
 postgis (2.0.3-4) unstable; urgency=low
 
   * Build-Deps: also make libmaven-clean-plugin-java and
diff --git a/debian/control b/debian/control
index 42a0f76..4ad4094 100644
--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,12 @@ Uploaders: Stephen Frost <sfrost at debian.org>, Francesco Paolo
 Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
  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~),
  libgtk2.0-dev, libgdal-dev (>= 1.6.0~) | libgdal1-dev (>= 1.6.0~),
- maven2, libmaven-clean-plugin-java, libmaven-jar-plugin-java,
- postgresql-server-dev-all, postgresql, postgresql-common (>= 146)
+ openjdk-6-jdk | openjdk-7-jdk, libpostgresql-jdbc-java, fastjar,
+ libjts-java (>= 1.7), maven2, libmaven-clean-plugin-java,
+ libmaven-jar-plugin-java, postgresql-server-dev-all,
+ postgresql-common (>= 146), postgresql
 Build-Depends-Indep: libsurefire-java, libmaven-compiler-plugin-java,
  libmaven-resources-plugin-java
 Standards-Version: 3.9.4
diff --git a/debian/control.in b/debian/control.in
index 7e5d3d3..023164a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,11 +7,12 @@ Uploaders: Stephen Frost <sfrost at debian.org>, Francesco Paolo
 Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
  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~),
  libgtk2.0-dev, libgdal-dev (>= 1.6.0~) | libgdal1-dev (>= 1.6.0~),
- maven2, libmaven-clean-plugin-java, libmaven-jar-plugin-java,
- postgresql-server-dev-all, postgresql, postgresql-common (>= 146)
+ openjdk-6-jdk | openjdk-7-jdk, libpostgresql-jdbc-java, fastjar,
+ libjts-java (>= 1.7), maven2, libmaven-clean-plugin-java,
+ libmaven-jar-plugin-java, postgresql-server-dev-all,
+ postgresql-common (>= 146), postgresql
 Build-Depends-Indep: libsurefire-java, libmaven-compiler-plugin-java,
  libmaven-resources-plugin-java
 Standards-Version: 3.9.4
diff --git a/debian/patches/fix-kfreebsd b/debian/patches/fix-kfreebsd
new file mode 100644
index 0000000..9c11885
--- /dev/null
+++ b/debian/patches/fix-kfreebsd
@@ -0,0 +1,15 @@
+Description: Treat Debian kFreeBSD the same as FreeBSD (and Linux)
+Author: Markus Wanner <markus at bluegap.ch>
+Last-Update: 2013-07-27
+
+--- a/raster/rt_core/rt_api.h
++++ b/raster/rt_core/rt_api.h
+@@ -42,7 +42,7 @@
+ #endif
+ 
+ 
+-#if defined(__FreeBSD__) || defined(__OpenBSD__)    /* seems to work like Linux... */
++#if defined(__FreeBSD_kernel__) || defined(__OpenBSD__)    /* seems to work like Linux... */
+ #if !defined(LINUX)
+ #define LINUX
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index d760310..0cd3661 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ use-debian-maven
 fix-manpages
 honor-build-flags
 fix-test-case-for-i386
+fix-kfreebsd
diff --git a/debian/rules b/debian/rules
index 057bc40..fbf6dfb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,9 +96,18 @@ build-arch-stamp: configuration-stamp
 #   now).
 	echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-2.0.3.so'" \
 		> $(CURDIR)/postgis-check-env.tmp
-	test -z '$(CHECK)' || \
+
+	(set -e; \
+		test -z '$(CHECK)' || \
 		pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \
-			-c '--environment $(CURDIR)/postgis-check-env.tmp' make check
+			-c '--environment $(CURDIR)/postgis-check-env.tmp' make check || (\
+		for LOGFILE in /tmp/pgis_reg/test_*_diff; do \
+			echo " ### $LOGFILE ###"; \
+			cat $$LOGFILE; \
+		done; \
+		echo " ### end of log dumps ###"; \
+		exit 2) \
+	)
 
 	touch $@
 
@@ -253,8 +262,16 @@ check: build-arch
 #   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
+	(set -e; \
+		pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \
+			-c '--environment $(CURDIR)/postgis-check-env.tmp' make check || (\
+		for LOGFILE in /tmp/pgis_reg/test_*_diff; do \
+			echo " ### $LOGFILE ###"; \
+			cat $LOGFILE; \
+		done; \
+		echo " ### end of log dumps ###"; \
+		exit 2) \
+	)
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep

-- 
PostGIS for PostgreSQL



More information about the Pkg-grass-devel mailing list