[Pkg-octave-commit] [octave] 02/02: Disable java on hppa, m68k, and sparc64 ports. Fixes FTBFS on those archs.

[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 2b26ba091728e13db98609e13f4de9c6110507df
Author: Mike Miller <mtmiller at debian.org>
Date:   Sun Aug 30 13:29:56 2015 -0400

    Disable java on hppa, m68k, and sparc64 ports. Fixes FTBFS on those archs.
    
    Update default-jre-headless arch exclusions to agree with NO_JDK_ARCHS.
    
    Closes: #792869
---
 debian/control | 2 +-
 debian/rules   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 4419835..00eb147 100644
--- a/debian/control
+++ b/debian/control
@@ -66,7 +66,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, texinfo, octave-common (= ${source:
          liboctave3 (= ${binary:Version})
 Recommends: gnuplot-x11 | gnuplot-qt, libopenblas-base | libatlas3-base,
  pstoedit,
- default-jre-headless [!armhf !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !sparc]
+ default-jre-headless [!hppa !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mipsel !sparc !sparc64]
 Suggests: octave-info,
  octave-doc,
  octave-htmldoc,
diff --git a/debian/rules b/debian/rules
index 5230985..d36da09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,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 := hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel sparc
+NO_JDK_ARCHS := hppa hurd-i386 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel sparc 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