[postgis-java] 04/09: Use default JVM for JAVA_HOME.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to tag debian/2.2.0-1.exp1
in repository postgis-java.

commit 5ca6c9fe516fbbee3fae4bbcf04e54f51684d5ad
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Nov 27 03:15:18 2015 +0100

    Use default JVM for JAVA_HOME.
---
 debian/changelog |  1 +
 debian/rules     | 13 +------------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91e05dc..7c45b73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ postgis-java (1:2.2.0-1) UNRELEASED; urgency=medium
   * Update copyright file, changes:
     - Drop copyright holders for removed ejb{2,3} files
     - Drop unused license paragraph
+  * Use default JVM for JAVA_HOME.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 27 Nov 2015 01:54:21 +0100
 
diff --git a/debian/rules b/debian/rules
index f7fc05a..c97171b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,6 @@
 #!/usr/bin/make -f
 
-# 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))","")
-      JAVA_HOME =
-    endif
-  endif
-endif
+export JAVA_HOME := /usr/lib/jvm/default-java
 
 # Use maven in offline mode and with the local Debian repo
 MVN = JAVA_HOME=$(JAVA_HOME) mvn --offline \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis-java.git