[libreoffice] 01/01: move gcj-jre after all the openjdks in 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 68449b795dad46f16046027661775feda507dbc6
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 26 09:36:39 2016 +0100
move gcj-jre after all the openjdks in JAVA_RUNTIME_DEPENDS
---
changelog | 7 +++++++
rules | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index 8532173..535b2fe 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.0.5~rc1-2) UNRELEASED; urgency=medium
+
+ * debian/rules:
+ - clean up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the openjdks
+
+ -- Rene Engelhard <rene@debian.org> Tue, 26 Jan 2016 09:35:18 +0100
+
libreoffice (1:5.0.5~rc1-1) unstable; urgency=medium
* New upstream release candidate
diff --git a/rules b/rules
index 94651df..f8f10d4 100755
--- a/rules
+++ b/rules
@@ -996,7 +996,7 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/$(DEB_HOST_MULTIARCH)/gcj-$(GCJ_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
- JAVA_RUNTIME_DEPENDS = default-jre | gcj-jre
+ JAVA_RUNTIME_DEPENDS = default-jre
# ifneq (,$(GCJ_JAWT_DEPENDS))
# JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
# endif
@@ -1007,6 +1007,7 @@ ifeq "$(ENABLE_JAVA)" "y"
JAVA_RUNTIME_DEPENDS += | openjdk-7-jre
endif
endif
+ JAVA_RUNTIME_DEPENDS += | gcj-jre
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386))
JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: