[SCM] postgis branch, master, updated. upstream/2.0.1-72-gacacf66

[Markus Wanner]

The following commit has been merged in the master branch:
commit acacf66410f804d2924e3d59d277e4e7691ffae1
Author: Markus Wanner <markus at bluegap.ch>
Date:   Wed Aug 7 15:52:33 2013 +0200

    * Let rules check for different OpenJDK versions supported and set
      JAVA_HOME accordingly.

diff --git a/debian/changelog b/debian/changelog
index 4500650..0aedfca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 postgis (2.0.3-7) UNRELEASED; urgency=low
 
+  * Let rules check for different OpenJDK versions supported and set
+    JAVA_HOME accordingly.
   * Use a simple rm rather than invoking maven. Allows us to move all java
     related Build-Depends back to Build-Depends-Indep.
 
diff --git a/debian/control b/debian/control
index a79bf16..314d141 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
  imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
  libgtk2.0-dev, libgdal-dev (>= 1.6.0~) | libgdal1-dev (>= 1.6.0~),
  postgresql-server-dev-all, postgresql-common (>= 146), postgresql
-Build-Depends-Indep: openjdk-7-jdk | openjdk-6-jdk,
+Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk | openjdk-6-jdk,
  libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7), maven2,
  libmaven-clean-plugin-java, libmaven-jar-plugin-java,
  libsurefire-java, libmaven-compiler-plugin-java,
diff --git a/debian/control.in b/debian/control.in
index f98c340..3ca9bb0 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autotools-dev,
  imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
  libgtk2.0-dev, libgdal-dev (>= 1.6.0~) | libgdal1-dev (>= 1.6.0~),
  postgresql-server-dev-all, postgresql-common (>= 146), postgresql
-Build-Depends-Indep: openjdk-7-jdk | openjdk-6-jdk,
+Build-Depends-Indep: openjdk-8-jdk | openjdk-7-jdk | openjdk-6-jdk,
  libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7), maven2,
  libmaven-clean-plugin-java, libmaven-jar-plugin-java,
  libsurefire-java, libmaven-compiler-plugin-java,
diff --git a/debian/rules b/debian/rules
index 8d0a77f..6d05dfb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,18 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-JAVA_HOME=/usr/lib/jvm/default-jdk
+# Determine JAVA_HOME to use. Depends on which Build-Depends-Indep
+# 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)
+  ifeq ("$(wildcard $(JAVA_HOME))","")
+    JAVA_HOME=/usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
+    ifeq ("$(wildcard $(JAVA_HOME))","")
+      $(error Cannot detect JAVA_HOME in $(JAVA_HOME))
+    endif
+  endif
+endif
 
 # Use maven in offline mode and with the local Debian repo
 MVN = mvn --offline -Dmaven.repo.local=/usr/share/maven-repo

-- 
PostGIS for PostgreSQL