[libreoffice] 01/01: ENABLE_MERGELIBS=y as it's now upstream default

[Rene Engelhard <rene@moszumanska.debian.org>]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.

commit bf2dd3de6e16fa74c41ee59f99317f60c905d943
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Jul 24 00:47:53 2015 +0200

    ENABLE_MERGELIBS=y as it's now upstream default
---
 changelog | 9 +++++++++
 rules     | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 1588f21..7d12b34 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+libreoffice (1:5.0.0~rc4~git20150719-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
+
+  * debian/rules:
+   - ENABLE_MERGELIBS=y as it's now upstream default
+
+ -- Rene Engelhard <rene@debian.org>  Fri, 17 Jul 2015 16:35:58 +0200
+
 libreoffice (1:5.0.0~rc3-1) experimental; urgency=medium
 
   * New upstream release candidate
diff --git a/rules b/rules
index 664c8ba..fa9baf1 100755
--- a/rules
+++ b/rules
@@ -415,7 +415,7 @@ USE_UCPP=y
 ifeq "$(USE_UCPP)" "y"
   SYSTEM_STUFF += ucpp
 endif
-ENABLE_MERGELIBS=n
+ENABLE_MERGELIBS=y
 USE_OPENCL=y
 #10:15 <@_rene_> ahunt: I remember you wanted to do some endian things? did it 
 #                ever get done?

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git