[libreoffice] 01/01: add openjdk-8-jre to JAVA_RUNTIME_DEPENDS
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 2651716857f35862dd6c4ab4e63b127b863ae9a7
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 26 09:39:23 2016 +0100
add openjdk-8-jre to JAVA_RUNTIME_DEPENDS
---
changelog | 3 ++-
rules | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 535b2fe..2f4bddb 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,8 @@
libreoffice (1:5.0.5~rc1-2) UNRELEASED; urgency=medium
* debian/rules:
- - clean up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the openjdks
+ - update/clean up up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the
+ openjdks and add openjdk-8-jre
-- Rene Engelhard <rene@debian.org> Tue, 26 Jan 2016 09:35:18 +0100
diff --git a/rules b/rules
index f8f10d4..3a30dd2 100755
--- a/rules
+++ b/rules
@@ -1002,7 +1002,7 @@ ifeq "$(ENABLE_JAVA)" "y"
# endif
ifneq (,$(filter $(DEB_HOST_ARCH), $(OOO_OPENJDK_ARCHS)))
ifneq "$(DEB_HOST_ARCH)" "ia64"
- JAVA_RUNTIME_DEPENDS += | openjdk-7-jre | openjdk-6-jre
+ JAVA_RUNTIME_DEPENDS += | openjdk-8-jre | | openjdk-7-jre | openjdk-6-jre
else
JAVA_RUNTIME_DEPENDS += | openjdk-7-jre
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: