[Pkg-octave-commit] [octave] 04/05: Reactivate java support on armhf.

[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 a2997fb02615034251e725305225a5ec9f330137
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Apr 24 16:03:40 2015 +0200

    Reactivate java support on armhf.
    
    It had been incorrectly disabled: the testsuite crash was actually caused by
    #767138, not by java.
---
 debian/changelog | 2 ++
 debian/rules     | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ce3767..f468415 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ octave (4.0.0~rc3-1) UNRELEASED; urgency=low
     - d/p/bump-soname.patch: patch to anticipate the bump by upstream.
     - d/control, d/liboctave?.install: rename the package
   * Remove obsolete Conflicts/Replaces against octave3.2* packages.
+  * Reactivate java support on armhf. It had been incorrectly disabled:
+    the testsuite crash was actually caused by #767138, not by java.
 
  -- Rafael Laboissiere <rafael at laboissiere.net>  Wed, 22 Apr 2015 06:25:00 -0300
 
diff --git a/debian/rules b/debian/rules
index 73943bd..5230985 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,13 +17,12 @@ export DEB_VERSION_UPSTREAM
 # a compilation failure (hurd-i386) or a test failure (other archs).
 # On mips and mipsel java unit tests calling openjdk-7 cause a bus error at
 # runtime.
-# On armhf, unit tests calling openjdk-7 cause a segmentation fault.
 # This arch list must be kept in sync with the arch list qualifying
 # default-jre in debian/control (note: we always want default-jdk in
 # 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 := armhf hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel sparc
+NO_JDK_ARCHS := hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel sparc
 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