[libreoffice] 02/05: Merge branch 'master' into debian-experimental-5.2

[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.2
in repository libreoffice.

commit 9b58eb650acac1f9e637c22d976d9dd95d297c1a
Merge: 5fc6e21 edea811
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Aug 15 13:01:44 2016 +0200

    Merge branch 'master' into debian-experimental-5.2
    
    Conflicts:
    	changelog

 changelog |  8 ++++++++
 control   | 10 +++++-----
 rules     |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --cc changelog
index 3187bb3,db3cde4..d20514d
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,11 +1,17 @@@
 +libreoffice (1:5.2.1~rc1-1) UNRELEASED; urgency=medium
 +
 +  * new upstream release candidate
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 11 Aug 2016 20:30:24 +0200
 +
+ libreoffice (1:5.2.0-3) UNRELEASED; urgency=medium
+ 
+   * debian/rules:
+     - filter-out kfreebsd-i386 and kfreebsd-amd64 explicitely out of
+       OOO_CHECK_ARCHS to save unneeded build-deps (again)
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 15 Aug 2016 09:28:42 +0200
+ 
  libreoffice (1:5.2.0-2) unstable; urgency=medium
  
    * debian/patches/make-package-modules-not-suck.diff: move animcore into

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