[Pkg-octave-commit] [octave] 01/02: Disable java on armel, fixes FTBFS on that arch.

[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 0a5ba293ae22cd196571c6e26897e65d57b52a64
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sat Sep 23 09:33:57 2017 +0200

    Disable java on armel, fixes FTBFS on that arch.
---
 debian/control | 2 +-
 debian/rules   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 5dce54e..44c6623 100644
--- a/debian/control
+++ b/debian/control
@@ -70,7 +70,7 @@ Depends: ${shlibs:Depends},
 Recommends: gnuplot-qt | gnuplot-x11 | gnuplot-nox,
             libopenblas-base | libatlas3-base,
             pstoedit,
-            default-jre-headless [!hppa !hurd-i386 !m68k !mips !mipsel !sparc64],
+            default-jre-headless [!armel !hppa !hurd-i386 !m68k !mips !mipsel !sparc64],
             octave-info
 Suggests: octave-doc,
           octave-htmldoc
diff --git a/debian/rules b/debian/rules
index e200d08..5f13b15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ export DEB_VERSION_UPSTREAM
 # build deps because it is needed for octave-common, see
 # debian/patches/always-build-octave-jar.patch).
 include /usr/share/dpkg/architecture.mk
-NO_JDK_ARCHS := hppa hurd-i386 m68k mips mipsel sparc64
+NO_JDK_ARCHS := armel hppa hurd-i386 m68k mips mipsel sparc64
 ifneq (,$(filter $(DEB_HOST_ARCH),$(NO_JDK_ARCHS)))
 WITH_JAVA_FLAGS := --disable-java
 else

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