[libreoffice] 01/01: 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 d2348ad700c53ceed3f4c7790395aa63cf61f65d
Merge: a81309a 260ccea
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Dec 3 20:35:06 2017 +0100

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

 changelog  | 12 ++++++++++++
 control    |  7 +------
 control.in |  2 +-
 rules      |  6 +++---
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --cc changelog
index cbbd7a3,5964f99..3140316
--- a/changelog
+++ b/changelog
@@@ -1,22 -1,15 +1,34 @@@
 +libreoffice (1:5.4.4~rc1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release candidate
 +
 +  * debian/patches/apparmor-complain.diff: set complain mode for oosplash
 +    and soffice.bin profiles
 +
 +  * 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
 +
 +  * debian/rules:
 +    - stop installing disabled symlinks for apparmor
 +    - actually install the OpenSymbol fontconfig snippet into a 
 +      /etc/fonts.d/30_opensymbol.conf
 +  * debian/libreoffice-common.bug-script.in: run aa-status
 +
 + -- Rene Engelhard <rene at debian.org>  Sat, 02 Dec 2017 12:05:38 +0100
 +
+ libreoffice (1:5.4.3-4) unstable; urgency=medium
+ 
+   * debian/control.in: remove openjdk conflicts ...
+   * debian/rules: ... and make them Depends in JAVA_RUNTIME_DEPENDS for the
+     Java-using packages. Also allow openjdk-9 everywhere
+   This doesn't prevent usage of the "broken" JDK but otherwise we "break"
+   jodconverter/natbraille in testing... And linux 4.14.2-1 is also supposed to
+   fix the regression finally...
+   This also closes: #882436
+ 
+  -- Rene Engelhard <rene at debian.org>  Sat, 02 Dec 2017 01:01:41 +0100
+ 
  libreoffice (1:5.4.3-3) unstable; urgency=medium
  
    * debian/patches/icu-60.diff: backport icu 60 support patch from master

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