This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice.
commit 5b243d4e0eab66a124522e6f4cb5e93bf8a06b26 Author: Rene Engelhard <[email protected]> Date: Sun Oct 11 12:25:03 2015 +0200 build-depend on a default-jdk having OpenJDK 7 for kfreebsd-* --- changelog | 2 ++ rules | 3 +++ 2 files changed, 5 insertions(+) diff --git a/changelog b/changelog index d0adf24..409c6ac 100644 --- a/changelog +++ b/changelog @@ -6,6 +6,8 @@ libreoffice (1:5.0.3~rc1-1) unstable; urgency=medium - use dh_installdocs --link-doc=libreoffice-{core,common} - update dh_shlibdeps calls for URE in /usr/lib/libreoffice/program and remove obsolete OOUREDIR + - build-depend on default-jdk (>= 2:1.7-52.1) for OpenJDK 7 on kfreebsd-* + again * debian/rules, debian/control.in: - readd conflicts against openoffice-unbundled to libreoffice-common. openoffice*-debian-menus contains /usr/bin/soffice diff --git a/rules b/rules index 0b5650d..ff9f3de 100755 --- a/rules +++ b/rules @@ -954,6 +954,9 @@ ifeq "$(ENABLE_JAVA)" "y" ifneq (,$(findstring ia64,$(OOO_JAVA_ARCHS))) BUILD_DEPS += , default-jdk (>= 1:1.7-48) [ia64] endif + ifneq (,$(findstring kfreebsd,$(OOO_JAVA_ARCHS))) + BUILD_DEPS += , default-jdk (>= 2:1.7-52.1) [kfreebsd-amd64 kfreebsd-i386] + 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
