[libreoffice] 02/03: build-depend on default-jdk (>= 2:1.8-55) on sparc64 to go sure
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 570780a3e447c08ec4a828d09268b81d81498c8c
Author: Rene Engelhard <rene@debian.org>
Date: Fri Feb 5 12:02:13 2016 +0100
build-depend on default-jdk (>= 2:1.8-55) on sparc64 to go sure
---
changelog | 1 +
control | 2 ++
rules | 3 +++
3 files changed, 6 insertions(+)
diff --git a/changelog b/changelog
index a695d9c..66abc2b 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,7 @@ libreoffice (1:5.0.5~rc2-1) unstable; urgency=medium
* debian/rules:
- update/clean up up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the
openjdks and add openjdk-8-jre
+ - build-depend on default-jdk (>= 2:1.8-55) on sparc64 to go sure
* debian/libreoffice-common.maintscript:
rm_conffile /etc/bash_completion.d/libreoffice.sh
* debian/scripts/gid2pkgdirs.sh: adapt for bash_completion move and install
diff --git a/control b/control
index eef0064..7622051 100644
--- a/control
+++ b/control
@@ -17,6 +17,7 @@ Build-Depends: ant (>= 1.7.0),
default-jdk,
default-jdk (>= 1:1.7-48) [ia64],
default-jdk (>= 2:1.7-52.1) [kfreebsd-amd64 kfreebsd-i386],
+ default-jdk (>= 2:1.8-55) [sparc64],
dh-python,
dpkg-dev (>= 1.16.1),
fastjar,
@@ -4354,6 +4355,7 @@ Depends: ant (>= 1.7.0),
debhelper (>= 7.2.3~),
default-jdk,
default-jdk (>= 2:1.7-52.1),
+ default-jdk (>= 2:1.8-55),
dh-python,
doxygen (>= 1.8.4),
dpkg-dev (>= 1.16.1),
diff --git a/rules b/rules
index 29962af..3b600be 100755
--- a/rules
+++ b/rules
@@ -959,6 +959,9 @@ ifeq "$(ENABLE_JAVA)" "y"
ifneq (,$(findstring kfreebsd,$(OOO_JAVA_ARCHS)))
BUILD_DEPS += , default-jdk (>= 2:1.7-52.1) [kfreebsd-amd64 kfreebsd-i386]
endif
+ ifneq (,$(findstring sparc64,$(OOO_JAVA_ARCHS)))
+ BUILD_DEPS += , default-jdk (>= 2:1.8-55) [sparc64]
+ endif
ifeq ($(java_default_version),5)
JDK=gcj-jdk
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: