[libreoffice] 01/01: 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 ef0c9c2f13cd69966c996e91f50cdf5aa189551e
Merge: 8b262bd e61b4ee
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Oct 9 22:09:23 2016 +0200

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

 changelog           | 20 +++++++++++++++++++-
 control             | 16 +---------------
 control.firebird.in | 13 +++++++++++++
 control.in          | 13 -------------
 rules               | 15 +++++++++++++--
 tests/control       |  2 +-
 6 files changed, 47 insertions(+), 32 deletions(-)

diff --cc changelog
index 9537a65,e863c2c..8daf0ac
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,21 +1,27 @@@
- libreoffice (1:5.2.3~rc1~git20160920-1) UNRELEASED; urgency=medium
++libreoffice (1:5.2.3~rc1~git20161009-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Wed, 07 Sep 2016 23:57:23 +0200
 +
+ libreoffice (1:5.2.2-1) UNRELEASED; urgency=medium
+ 
+   * LibreOffice 5.2.2 final release (identical to rc2)
+ 
+   * debian/rules:
+     - add /usr/include/libreoffice/sal/typesizes.h symlink to multiarch
+       include dir to fix SDK usage e.g in the SDK examples
+     - disable firebird (as sid now got firebird-dev 3.0)
+ 
+  -- Rene Engelhard <rene at debian.org>  Sun, 09 Oct 2016 15:36:43 +0200
+ 
+ libreoffice (1:5.2.2~rc2-2) unstable; urgency=medium
+ 
+   * work around libcoinutils-dev pulling in -lbz2 without depending on it
+     by Build-Depending on it here (temporarily) 
+ 
+  -- Rene Engelhard <rene at debian.org>  Fri, 23 Sep 2016 07:24:37 +0200
+ 
  libreoffice (1:5.2.2~rc2-1) unstable; urgency=medium
  
    * New upstream release candidate

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