[libreoffice] 02/02: Merge remote-tracking branch 'origin/master' into debian-experimental-5.2

[Rene Engelhard]

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 5bb6cd0f98d1fc85d90917f7d30f6373be7f31d4
Merge: ea023f4 76a1c8c
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Sep 8 00:04:24 2016 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
    
    Conflicts:
    	changelog

 changelog  | 13 +++++++++++++
 control    |  1 -
 control.in |  2 +-
 rules      |  7 ++++---
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --cc changelog
index dbf00c9,c29910b..cce2e96
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,16 +1,22 @@@
 +libreoffice (1:5.2.2~rc1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release candidate
 +
 + -- Rene Engelhard <rene at debian.org>  Wed, 07 Sep 2016 23:57:23 +0200
 +
+ libreoffice (1:5.2.1-2) UNRELEASED; urgency=medium
+ 
+   * debian/rules: install typesizes.h into
+     usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal/typesizes.h
+   * debian/control.in: remove
+     libreoffice-report-builder-bin [kfreebsd-i386 kfreebsd-amd64] Conflicts:
+     from -core, thanks Jon Boden (closes: #836887)
+ 
+   * merge from Ubuntu:
+     - uno-libs: Create the libuno_* symlinks in the multiarch libdir
+ 
+  -- Rene Engelhard <rene at debian.org>  Wed, 07 Sep 2016 10:12:27 +0200
+ 
  libreoffice (1:5.2.1-1) unstable; urgency=medium
  
    * LibreOffice 5.2.1 final (identical to rc2)

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