[libreoffice] 06/15: reenable mergedlibs
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 05c105ecfd7512724f56006cc746b2d8f4b2314e
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Sep 11 01:42:12 2014 +0200
reenable mergedlibs
---
changelog | 6 ++++++
rules | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index 5f026f3..c662aef 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.3.1~rc2-0ubuntu2) UNRELEASED; urgency=medium
+
+ * reenable mergedlibs
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 11 Sep 2014 01:40:10 +0200
+
libreoffice (1:4.3.1~rc2-0ubuntu1) utopic; urgency=medium
* new upstream rc
diff --git a/rules b/rules
index daa767c..51de82f 100755
--- a/rules
+++ b/rules
@@ -704,7 +704,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
Reply to: