[libreoffice] 02/02: Merge remote-tracking branch 'origin/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 9855f153bc66c2e4237fbcf7e6356ecc1634321c
Merge: 901796b 1ac9c6d
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Sep 11 19:40:46 2017 +0200

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

 changelog | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --cc changelog
index 3e5f92d,4929fc4..6ba19e8
--- a/changelog
+++ b/changelog
@@@ -1,23 -1,14 +1,32 @@@
- libreoffice (1:6.0.0~alpha0~git20170910-1) UNRELEASED; urgency=medium
 -libreoffice (1:5.4.2~rc1~git20170830-1) UNRELEASED; urgency=medium
++libreoffice (1:6.0.0~alpha0~git20170911-1) UNRELEASED; urgency=medium
 +
 +  [ Rene Engelhard ]
 +  * New upstream snapshot
 +
 +  * 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, 18 May 2017 12:54:08 +0200
 +
++libreoffice (1:5.4.2~rc1~git20170911-1) UNRELEASED; urgency=medium
+ 
+   * New upstream snapshot
+ 
+  -- Rene Engelhard <rene at debian.org>  Wed, 30 Aug 2017 20:46:06 +0200
+ 
  libreoffice (1:5.4.1-2) UNRELEASED; urgency=medium
  
+   * debian/patches/make-helpimg-not-selectable-as-iconset.diff: as name
+     says, from libreoffice-5-4 branch (closes: #874196)
+ 
    * debian/rules:
      - move STRETCH_BACKPORT conditional for coinmp lower in rules so it
        gets honoured and make libwps/libmwaw internal unconditionally

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