[libreoffice] 02/02: Merge remote-tracking branch 'origin/master' 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 626a1dfa477eff6f8efd8af4267a8fbd7b01c265
Merge: 57c5444 72d1c70
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Fri Sep 22 09:20:18 2017 +0200

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

 changelog | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --cc changelog
index 7d44b51,a11893d..cb53c1c
--- a/changelog
+++ b/changelog
@@@ -1,19 -1,5 +1,17 @@@
 +libreoffice (1:5.4.2~rc1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release candidate
 +
 +  * debian/control.in: remove -style-default provides since it doesn't help at
 +    all on default changes; depend on tango since that apparently is now the
 +    (last) fallback (closes: #874196)
 +  * debian/control.gtk?.in: remove -style-tango recommends, obsoleted by
 +    above
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 21 Sep 2017 20:18:13 +0200
 +
- libreoffice (1:5.4.1-2) unstable; urgency=medium
+ 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/patches/icu-no-icu-config.diff: don't use icu-config for
      determining the ICU version; doesn't exist in (Debians) ICU 59.1 anymore
  

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