[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 2c3555a74bdf17c55739c243ff4ec5952b60c487
Merge: 325bee0 b6a4d06
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 21 23:43:34 2017 +0100

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

 changelog           |  10 ++++
 patches/icu-60.diff | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 patches/series      |   1 +
 rules               |  14 +++---
 4 files changed, 149 insertions(+), 8 deletions(-)

diff --cc changelog
index f93169e,61bc39b..5dd4481
--- a/changelog
+++ b/changelog
@@@ -1,13 -1,13 +1,23 @@@
 +libreoffice (1:5.4.4~rc1~git20171119-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 +  * debian/libreoffice-common.{triggers,postinst}.in,
 +    debian/shell-lib-lool.sh: add trigger updating LOOLs systemplate
 +  * debian/libreoffice-common.triggers.in: switch to interest-noawait triggers
 +
 + -- Rene Engelhard <rene at debian.org>  Fri, 20 Oct 2017 13:40:01 +0000
 +
+ libreoffice (1:5.4.3-3) UNRELEASED; urgency=medium
+ 
+   * debian/patches/icu-60.diff: backport icu 60 support patch from master
+ 
+   * debian/rules: replace some manual dpkg-parsechangelog calls with
+     $(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for
+     --disable-dependency-tracking
+ 
+  -- Rene Engelhard <rene at debian.org>  Mon, 20 Nov 2017 19:50:09 +0100
+ 
  libreoffice (1:5.4.3-2) unstable; urgency=medium
  
    * debian/patches/java9-*: remove ...

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