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 9a2372e56cd52dbe742eb97462d11f32c56c8349
Author: Rene Engelhard <r...@debian.org>
Date: Sat Oct 10 14:20:45 2015 +0200
also disable mediawiki on gcj builds; uses Java 6+ stuff
---
changelog | 1 +
rules | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 6797b25..76e6937 100644
--- a/changelog
+++ b/changelog
@@ -21,6 +21,7 @@ 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
* 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 0fe21b3..b9d5a7b 100755
--- a/rules
+++ b/rules
@@ -675,8 +675,9 @@ endif
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_GCJ_JDK_ARCHS)))
ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_OPENJDK_ARCHS)))
ENABLE_REPORTDESIGN=n
- SYSTEM_STUFF := $(filter-out jfreereport, $(SYSTEM_STUFF))
- DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin
-Nlibreoffice-report-builder
+ ENABLE_MEDIAWIKI=n
+ SYSTEM_STUFF := $(filter-out jfreereport apache-commons,
$(SYSTEM_STUFF))
+ DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin
-Nlibreoffice-report-builder -Nlibreoffice-wiki-publisher
endif
endif
# disable SRB on ia64 when building with internal jfreereport.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
