[libreoffice] 03/06: Merge debian-experimental-5.4 into debian-experimental-6.0

[Rene Engelhard]

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

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

commit c16b8e5a2e8be0aaec239a75d9cf74f0c4190979
Merge: 20cc9b9 b1f49a6
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Oct 20 15:18:46 2017 +0200

    Merge debian-experimental-5.4 into debian-experimental-6.0

 changelog | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --cc changelog
index bfb4854,fd135b8..c31ea16
--- a/changelog
+++ b/changelog
@@@ -1,25 -1,4 +1,25 @@@
 +libreoffice (1:6.0.0~alpha1-1) UNRELEASED; urgency=medium
 +
 +  [ Rene Engelhard ]
 +  * New upstream alpha release
 +
 +  * debian/patches/tdf108963-test.diff: adapt test to what we get; the
 +    text _is_ rotated on export, so...
 +
 +  * merge from Ubuntu, thanks Rico Tzschichholz:
 +    - Add "elementary" style package
 +
 +  * debian/rules:
 +    - finally stop building -systray. GNOME 3.26 doesn't show it anymore,
 +      and in 6.0 the feature is not completely removed yet but the UI for
 +      setting it is already gone anyway....
 +
 +  [ Rico Tzschichholz ]
 +  * Add Kannada (kn) langpack
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 19 Oct 2017 15:49:57 +0200
 +
- libreoffice (1:5.4.3~rc1-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.3~rc1-1) experimental; urgency=medium
  
    * New upstream release candidate
  

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