[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.4' 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 48027889a69522cf726ff36911b423130ec1c8ae
Merge: 14fcc0d f48d271
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 11 21:27:43 2017 +0100

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

 changelog                        | 4 ++++
 libreoffice-common.bug-script.in | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --cc changelog
index 3d409de,221b461..e9f68c5
--- a/changelog
+++ b/changelog
@@@ -1,32 -1,20 +1,36 @@@
 -libreoffice (1:5.4.4~rc1-1) UNRELEASED; urgency=medium
 +libreoffice (1:6.0.0~rc1~git20171211-1) UNRELEASED; urgency=medium
  
 -  [ Rene Engelhard ]
 -  * New upstream release candidate
 -    - colours referenced cells again (closes: #883254)
 +  * New upstream snapshot
  
 -  * debian/patches/apparmor-complain.diff: set complain mode for oosplash
 -    and soffice.bin profiles
    * debian/patches/apparmor-usrmerge.diff: allow also /usr/bin/dash (etc.)
      - usrmerge...
 -  * debian/patches/apparmor-updates.diff: updates to the apparmor profiles
 -    (allow /usr/bin/gpgconf)
    * debian/patches/apparmor-fixes.diff: fixes to the apparmor 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/libreoffice-common.bug-script.in: revert running aa-status;
++    Might not exist and actually displaying the status needs root. People
++    shouldn't run reportbug as root, though...
++
 + -- Rene Engelhard <rene at debian.org>  Sat, 09 Dec 2017 00:22:29 +0100
 +
 +libreoffice (1:6.0.0~beta2-1) experimental; urgency=medium
 +
 +  [ Rene Engelhard ]
 +  * New upstream beta release
 +
 +  * debian/patches/apparmor-complain.diff: set complain mode for oosplash
 +    and soffice.bin profiles
 +  * debian/patches/sal-fix-kfreebsd-build.diff: add from gerrit
 +  * debian/patches/disable-gbuildtojson.diff: disable gbuildtojson and its
 +    tests. We don't need it and it fails now related to the gpg-agent files
 +    created by xmlsecurity_signing cppunit test which uses gpg...
 +
 +  * 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/rules:
      - stop installing disabled symlinks for apparmor (closes: #883800)

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