[Pkg-octave-commit] [octave] 01/02: Build-depend on javahelper, use to configure default Java paths.

[Mike Miller]

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

mtmiller pushed a commit to branch master
in repository octave.

commit c065f9e4f8d5b034165fb75bbc2d98c82d074a50
Author: Mike Miller <mtmiller at debian.org>
Date:   Sun Jan 5 19:51:49 2014 -0500

    Build-depend on javahelper, use to configure default Java paths.
---
 debian/control | 3 ++-
 debian/rules   | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 74b7be6..0e40089 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends: gfortran, debhelper (>= 9), automake, dh-autoreconf, texinfo,
  libqhull-dev, desktop-file-utils, libfltk1.3-dev, libgl2ps-dev,
  libgraphicsmagick++1-dev, libftgl-dev, libfontconfig1-dev,
  libqrupdate-dev, libarpack2-dev (>= 2.1+parpack96.dfsg-2), dh-exec,
- dpkg-dev (>= 1.16.1), llvm-dev, default-jdk, libqscintilla2-dev, libxft-dev
+ dpkg-dev (>= 1.16.1), llvm-dev, default-jdk, libqscintilla2-dev, libxft-dev,
+ javahelper
 Standards-Version: 3.9.5
 Homepage: http://www.octave.org/
 Vcs-Git: git://anonscm.debian.org/pkg-octave/octave.git
diff --git a/debian/rules b/debian/rules
index 8bf7a30..e8a93e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,10 @@ include /usr/share/dpkg/pkg-info.mk
 DEB_VERSION_UPSTREAM := $(subst ~rc,-rc,$(DEB_VERSION_UPSTREAM))
 export DEB_VERSION_UPSTREAM
 
+# Configure default Java paths using javahelper
+include /usr/share/javahelper/java-vars.mk
+JAVA_LIBDIR := $(firstword $(JVM_CLIENT_DIR) $(JVM_SERVER_DIR))
+
 %:
 	dh $@ --with autoreconf --parallel
 
@@ -20,7 +24,8 @@ clean:
 
 # override normal dh_auto_configure call to pass OpenMP flag to it (#631831)
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-openmp --with-java-homedir=/usr/lib/jvm/default-java/
+	dh_auto_configure -- --enable-openmp --with-java-homedir=$(JAVA_HOME) \
+		--with-java-libdir=$(JAVA_LIBDIR)
 
 # dh_auto_test tries to run "make test", so override it
 override_dh_auto_test:

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git