[Pkg-octave-commit] [octave] 08/15: Add LLVM, QScintilla and the default JDK to build dependencies.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository octave.

commit 89e7f04a4145f09553d32a55f9adf57b21a76f32
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Dec 11 14:18:02 2013 +0100

    Add LLVM, QScintilla and the default JDK to build dependencies.
    
    Also make octave depend on the default headless JRE.
---
 debian/control | 6 +++---
 debian/rules   | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 895b6e1..302f651 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Thomas Weber <tweber at debian.org>,
            Sébastien Villemot <sebastien at debian.org>
 Build-Depends: gfortran, debhelper (>= 9), automake, dh-autoreconf, texinfo,
  texlive-latex-base, texlive-generic-recommended, epstool, transfig, pstoedit,
- libreadline-dev | libreadline6-dev | libreadline5-dev,
+ libreadline-dev,
  libncurses5-dev, gperf, libhdf5-dev (>= 1.8.8),
  libblas-dev (>=1.2-7), liblapack-dev (>= 3.4.1-4), gnuplot-nox, libfftw3-dev,
  less, libpcre3-dev, flex, libglpk-dev (>= 4.15),
@@ -14,7 +14,7 @@ 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)
+ dpkg-dev (>= 1.16.1), llvm-dev, default-jdk, libqscintilla2-dev, libxft-dev
 Standards-Version: 3.9.5
 Homepage: http://www.octave.org/
 Vcs-Git: git://anonscm.debian.org/pkg-octave/octave.git
@@ -23,7 +23,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-octave/octave.git
 Package: octave
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, texinfo, octave-common (= ${source:Version}),
-         liboctave1 (= ${binary:Version})
+         liboctave1 (= ${binary:Version}), default-jre-headless
 Recommends: gnuplot-x11 | gnuplot-qt, libatlas3-base | libopenblas-base,
  pstoedit
 Suggests: octave-info,
diff --git a/debian/rules b/debian/rules
index ca7af85..db8aea7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,8 @@ clean:
 	dh clean --with autoreconf
 
 # override normal dh_auto_configure call to pass OpenMP flag to it (#631831)
-# and while we are at it, disable the rpath (thanks lintian)
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-openmp --disable-rpath
+	dh_auto_configure -- --enable-openmp --with-java-homedir=/usr/lib/jvm/default-java/
 
 # override normal dh_compress call to avoid compressing .pdf files
 override_dh_compress:

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