This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-utopic-4.3
in repository libreoffice.
commit 753696993054c586a69352d26fcfc7aa6f74e609
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Jul 10 22:02:58 2014 +0200
disable mergelibs
---
changelog | 6 ++++++
rules | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index 6725845..e496fd0 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.3.0~rc2-1ubuntu1~utopic2) utopic; urgency=medium
+
+ * disable mergelibs for now for (lp: #1333073)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 10 Jul 2014 21:59:42 +0200
+
libreoffice (1:4.3.0~rc2-1ubuntu1~utopic1) utopic; urgency=medium
* merge from debian
diff --git a/rules b/rules
index 51897ec..9ba4ebc 100755
--- a/rules
+++ b/rules
@@ -656,7 +656,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
#endif
RUN_PYTESTS:=n
PARALLEL_BUILD=y
- ENABLE_MERGELIBS=y
+ #ENABLE_MERGELIBS=y
ON_BUILDD := $(shell if [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] || echo $(CURDIR) | grep -q \/build\/buildd; then echo y; else echo n; fi)
ifeq ($(ON_BUILDD),y)
buildd_discspace_hack:=find workdir/ -type f -name '*.o' -exec mv {} {}_org \; -exec touch -r {}_org {} \; -exec rm {}_org \;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git