[Pkg-octave-commit] [octave] 05/08: Drop sparc from arch list without java: arch no longer exists.

Sébastien Villemot sebastien at debian.org
Sun Sep 10 19:50:42 UTC 2017


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

sebastien pushed a commit to branch master
in repository octave.

commit 50227edf460c6aee37415d037227b68efd4ccdd7
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sun Sep 10 17:07:01 2017 +0200

    Drop sparc from arch list without java: arch no longer exists.
    
    Gbp-Dch: Ignore
---
 debian/control | 2 +-
 debian/rules   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 1150869..62eba36 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 !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mipsel !sparc !sparc64],
+            default-jre-headless [!hppa !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mipsel !sparc64],
             octave-info
 Suggests: octave-doc,
           octave-htmldoc
diff --git a/debian/rules b/debian/rules
index 207d733..182e9e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ DEB_VERSION_UPSTREAM := $(subst ~rc,-rc,$(DEB_VERSION_UPSTREAM))
 export DEB_VERSION_UPSTREAM
 
 # Configure default Java paths using javahelper except on some archs.
-# hurd-i386, kfreebsd-* and sparc have gcj as default, which cause either
+# hurd-i386 and hppa have gcj as default, which cause either
 # 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.
@@ -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 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel sparc sparc64
+NO_JDK_ARCHS := hppa hurd-i386 kfreebsd-amd64 kfreebsd-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



More information about the Pkg-octave-commit mailing list