[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.3' into debian-experimental-5.4

[Rene Engelhard]

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

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

commit c471830652be475d1f939c96568d7ec3cd0ab7cf
Merge: 558c938 1734d77
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Mar 21 16:33:37 2017 +0100

    Merge remote-tracking branch 'origin/debian-experimental-5.3' into debian-experimental-5.4

 changelog      | 10 ++++++++++
 control        |  4 +++-
 control.sdk.in |  3 ++-
 rules          |  3 ++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --cc changelog
index a43c872,125b537..ace6edf
--- a/changelog
+++ b/changelog
@@@ -1,14 -1,13 +1,24 @@@
 +libreoffice (1:5.4.0~alpha0~git20170224-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 +  * debian/scripts/gid2pkgdirs.sh, debian/control{,.transitionals}.in:
 +    remove extra libreoffice-pdfimport, merge (even though the poppler
 +    dependency...) back to -common/-core since with the (disabled) pdfium
 +    feature it may get confusing what is what.
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 24 Nov 2016 07:27:55 +0100
 +
+ libreoffice (1:5.3.2~rc1-1) UNRELEASED; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/rules:
+     - move /usr/include/libreoffice/sal/typesizes.h symlink to -dev
+       instead of -dev-common (closes: #858199)
+ 
+  -- Rene Engelhard <rene at debian.org>  Mon, 20 Mar 2017 11:46:38 +0100
+ 
  libreoffice (1:5.3.1-1) experimental; urgency=medium
  
    * New upstream release

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