[libreoffice] 01/01: 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 489486f9fdf6b8be11fbd4e2126c5075c4cfad44
Merge: 9855f15 4669b85
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Sep 22 11:00:52 2017 +0200

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

 changelog       | 19 ++++++++++---------
 control         | 18 +++++++-----------
 control.gtk2.in |  1 -
 control.gtk3.in |  1 -
 control.in      | 16 +++++++---------
 rules           | 15 ++++++++++++---
 6 files changed, 36 insertions(+), 34 deletions(-)

diff --cc changelog
index 6ba19e8,1095f01..e14e9bf
--- a/changelog
+++ b/changelog
@@@ -1,31 -1,9 +1,27 @@@
 +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
+ libreoffice (1:5.4.2~rc1-1) experimental; 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
+   * New upstream release candidate
  
-   * debian/patches/make-helpimg-not-selectable-as-iconset.diff: as name
-     says, from libreoffice-5-4 branch (closes: #874196)
+   * debian/patches/icu-no-icu-config.diff: don't use icu-config for
+     determining the ICU version; doesn't exist in (Debian's) ICU 59.1 anymore
  
    * debian/rules:
      - move STRETCH_BACKPORT conditional for coinmp lower in rules so it

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