This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-wily-5.0
in repository libreoffice.
commit dec7a82811e62fc233b918d0ca800ce0af1d1597
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Mon Aug 31 20:32:24 2015 +0200
merge ricotz 1.1 changes
---
changelog | 7 +++++++
rules | 8 ++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/changelog b/changelog
index 3f51efc..bd3f7c9 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.0.1~rc2-0ubuntu1~wily1.1) wily; urgency=medium
+
+ * Enabled KDE support
+ * Use cpp-5
+
+ -- Rico Tzschichholz <ric...@ubuntu.com> Sat, 29 Aug 2015 06:57:43 +0200
+
libreoffice (1:5.0.1~rc2-0ubuntu1~wily1) wily; urgency=medium
* new upstream rc
diff --git a/rules b/rules
index 956b091..f9f6c18 100755
--- a/rules
+++ b/rules
@@ -194,7 +194,7 @@ SYSTEM_STUFF += libabw
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
CAIRO_FONTS_PATCH=y
-BUILD_KDE=n
+BUILD_KDE=y
# not ported to KDE 4
ENABLE_KDEAB=n
# < 4.8 fails with gcc 4.7, see #667911
@@ -697,7 +697,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
IMAGES+=human
CONFIGURE_FLAGS_INDEP+= --with-theme="$(IMAGES)"
ENABLE_FIREBIRD=n
- USE_UCPP=y
+ USE_UCPP=n
# lp#1034560: MIR troubles make it easier to use internal jfreereport
SYSTEM_STUFF := $(filter-out jfreereport npapi-headers, $(SYSTEM_STUFF))
ifeq ($(shell echo "$(DEB_VERSION)" | grep -c ppa),1)
@@ -1120,8 +1120,8 @@ else
# 14:17 <@caolan> ah, "build fails with cpp 4.8.0, this is fixable by passing
# -P, but then idlc produces empty urd files"
# trying to use cpp-4.9 instead now
- IDLC_CPP_DEPENDS := cpp-4.9
- CONFIGURE_FLAGS += --with-idlc-cpp=cpp-4.9
+ IDLC_CPP_DEPENDS := cpp-5
+ CONFIGURE_FLAGS += --with-idlc-cpp=cpp-5
endif
BUILD_DEPS += , $(IDLC_CPP_DEPENDS)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
