[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 4669b85bbcc38c026dfeb0db5c03d5accfaadba8
Merge: 6ffca73 d18c014
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Fri Sep 22 10:51:47 2017 +0200

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

 changelog                      |  2 +-
 patches/icu-no-icu-config.diff | 44 ++++++++++++++++++++++++++++++++----------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --cc changelog
index 716abd6,9308b80..1095f01
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,7 +1,9 @@@
 -libreoffice (1:5.4.1-2) UNRELEASED; urgency=medium
 +libreoffice (1:5.4.2~rc1-1) experimental; urgency=medium
 +
 +  * New upstream release candidate
  
    * 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
+     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