This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch debian-experimental-5.1 in repository libreoffice.
commit 7a39722b64a1ccd086c1a91f4476d96925f28aac Author: Rene Engelhard <r...@debian.org> Date: Sat Oct 10 15:36:41 2015 +0200 make wiki-publisher depend on >= Java 6 --- changelog | 3 ++- rules | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog b/changelog index 76e6937..f3e79d3 100644 --- a/changelog +++ b/changelog @@ -21,7 +21,8 @@ libreoffice (1:5.1.0~alpha1~git20151009-1) UNRELEASED; urgency=medium * debian/rules: - gtk3 is on per default now (closes: #799399, #681180) - disable the tests for now - - also disable mediawiki on gcj builds; uses Java 6+ stuff + - also disable the wiki publisher on gcj builds; uses Java 6+ stuff; make + -wiki-publisher depend on >= Java 6 * debian/rules: prepare for .ddebs: disable manual -dbg build if building ddebs; use dh_strip --ddeb-migration to create .ddebs diff --git a/rules b/rules index b9d5a7b..4ab5003 100755 --- a/rules +++ b/rules @@ -1037,6 +1037,7 @@ ifeq "$(ENABLE_JAVA)" "y" JAVA_RUNTIME_DEPENDS += | java5-runtime # Suns Java "packages" JAVA_RUNTIME_DEPENDS += | jre + MEDIAWIKI_JAVA_RUNTIME_DEPENDS = $(shell echo $(JAVA_RUNTIME_DEPENDS) | sed -e "s/gcj-jre |//" | sed -e "s/sun-java5-jre//" | sed -e "s/java5-runtime/java6-runtime/") GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep libjawt.so | head -n 1`) export JAVA_HOME CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME) @@ -3488,7 +3489,7 @@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y" endif ifeq "$(ENABLE_MEDIAWIKI)" "y" dh_gencontrol -plibreoffice-wiki-publisher -- \ - -V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \ + -V'java-runtime-depends=$(MEDIAWIKI_JAVA_RUNTIME_DEPENDS)' \ -v$(shell grep "<version" $(SOURCE_TREE)/swext/mediawiki/src/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2` endif ifeq "$(ENABLE_REPORTDESIGN)" "y" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git