[SCM] postgis branch, master, updated. upstream/2.0.1-75-g217fba8

[Markus Wanner]

The following commit has been merged in the master branch:
commit 217fba8d0e3cfe73e78c3b17ae80f58c0bd67ed3
Author: Markus Wanner <markus at bluegap.ch>
Date:   Wed Aug 7 22:02:46 2013 +0200

    Don't err out when setting JAVA_HOME, but only later in
    build-indep. So arch-only builds that don't have (nor need) the java
    cruft available can succeed.

diff --git a/debian/changelog b/debian/changelog
index 410b0f3..c8780be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+postgis (2.0.3-8) UNRELEASED; urgency=low
+
+  * Don't err out when setting JAVA_HOME, but only later in
+    build-indep. So arch-only builds that don't have (nor need) the java
+    cruft available can succeed.
+
+ -- Markus Wanner <markus at bluegap.ch>  Wed, 07 Aug 2013 20:37:28 +0200
+
 postgis (2.0.3-7) unstable; urgency=low
 
   * Let rules check for different OpenJDK versions supported and set
diff --git a/debian/rules b/debian/rules
index ee64381..7d4f8b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,11 +52,11 @@ DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 # variant has been used.
 JAVA_HOME = /usr/lib/jvm/java-8-openjdk-$(DEB_BUILD_ARCH)
 ifeq ("$(wildcard $(JAVA_HOME))","")
-  JAVA_HOME=/usr/lib/jvm/java-7-openjdk-$(DEB_BUILD_ARCH)
+  JAVA_HOME = /usr/lib/jvm/java-7-openjdk-$(DEB_BUILD_ARCH)
   ifeq ("$(wildcard $(JAVA_HOME))","")
-    JAVA_HOME=/usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
+    JAVA_HOME = /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
     ifeq ("$(wildcard $(JAVA_HOME))","")
-      $(error Cannot detect JAVA_HOME in $(JAVA_HOME))
+      JAVA_HOME =
     endif
   endif
 endif
@@ -110,6 +110,10 @@ build-arch-stamp: configuration-stamp
 
 build-indep: build-indep-stamp
 build-indep-stamp: configuration-stamp
+#	Re-check JAVA_HOME
+	@[ -n "$(JAVA_HOME)" ] || (echo "ERROR: didn't find a Java JDK"; exit 2)
+	@[ -x "$(JAVA_HOME)/bin/javac" ] || (echo "ERROR: no javac in JAVA_HOME=$(JAVA_HOME)"; exit 2)
+
 #	PostGIS JDBC (with debug support)
 	cd $(CURDIR)/java/jdbc && $(MVN) package
 

-- 
PostGIS for PostgreSQL