This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-vivid-4.4
in repository libreoffice.
commit 843b7f32e657c93c3eac282543209940c72264f9
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Wed Jan 28 18:15:56 2015 +0100
reenable MERGELIBS
---
changelog | 1 +
rules | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index 833f053..fd388d5 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,7 @@ libreoffice (1:4.4.0~rc3-1ubuntu1) UNRELEASED; urgency=medium
* merge from Debian
* use system mwaw, now that 0.3.4-1 is synced to main (LP: #1410883)
+ * reenable MERGELIBS
-- Bjoern Michaelsen <bjoern.michael...@canonical.com> Wed, 28 Jan 2015
17:40:59 +0100
diff --git a/rules b/rules
index f1c3662..4dbd560 100755
--- a/rules
+++ b/rules
@@ -660,7 +660,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
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yoosn-0007cq...@moszumanska.debian.org
