[libreoffice] 02/02: Merge tag 'libreoffice_6.0.0_beta1-2' 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 c8fc72d4a15e1dce345d6b7dc84c530f3f1bffe0
Merge: 539d158 a3ada06
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 4 19:13:37 2017 +0100

    Merge tag 'libreoffice_6.0.0_beta1-2' into debian-experimental-6.0
    
    tag libreoffice 1:6.0.0~beta1-2

 changelog | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --cc changelog
index 74381e4,db5d47a..3a3fb3e
--- a/changelog
+++ b/changelog
@@@ -1,27 -1,13 +1,32 @@@
 +libreoffice (1:6.0.0~beta2~git20171130-1) UNRELEASED; urgency=medium
 +
 +  * debian/patches/apparmor-complain.diff: set complain mode for oosplash
 +    and soffice.bin profiles
 +
 +  * 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
 +
-   * 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 01:01:41 +0100
+ libreoffice (1:6.0.0~beta1-2) experimental; urgency=medium
+ 
+   * 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
+ 
+   * merge from Ubuntu:
+     - debian/patches/fix-includes-in-aarch64-bridge.patch: add from master
+ 
+  -- Rene Engelhard <rene at debian.org>  Mon, 04 Dec 2017 19:01:27 +0100
  
  libreoffice (1:6.0.0~beta1-1) experimental; urgency=medium
  

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