[mkgmap-splitter] 03/03: Use OpenJDK 8 for jessie-backports.

Bas Couwenberg sebastic at debian.org
Sun Aug 14 09:50:23 UTC 2016


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

sebastic pushed a commit to branch jessie-backports
in repository mkgmap-splitter.

commit 9f664bbdb74c85f1b05855671dbc531e97aa37fd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 13 14:03:24 2016 +0200

    Use OpenJDK 8 for jessie-backports.
---
 debian/changelog          | 1 +
 debian/mkgmap-splitter.sh | 2 ++
 debian/rules              | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e53a04..8b5ad5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mkgmap-splitter (0.0.0+svn438-2~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
+  * Use OpenJDK 8 for jessie-backports.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 13 Aug 2016 13:43:32 +0200
 
diff --git a/debian/mkgmap-splitter.sh b/debian/mkgmap-splitter.sh
index cab0317..8421378 100644
--- a/debian/mkgmap-splitter.sh
+++ b/debian/mkgmap-splitter.sh
@@ -17,6 +17,8 @@ if [ -z "$JAVA_OPTS" -o $(echo "$JAVA_OPTS" | grep "\-Xmx" | wc -l) -eq 0 ]; the
 fi
 
 if [ -z "${JAVACMD}" ]; then
+    JAVACMD=/usr/lib/jvm/java-8-openjdk-$ARCH/bin/java
+
     for jcmd in $JAVA_CMDS; do
        if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
           JAVACMD="$jcmd"
diff --git a/debian/rules b/debian/rules
index 224507d..aca27f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,9 @@
 
 JAVA_HOME=/usr/lib/jvm/default-java
 
+# Use OpenJDK 8 for jessie-backports
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
 BUILD_DATE=$(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date -u "+%d %B %Y" -f -)
 
 MANPAGES:=$(wildcard debian/man/*.*.xml)

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



More information about the Pkg-grass-devel mailing list