[libreoffice] 01/01: git update; 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 14fcc0d30b3bfe71332f0590353e7d83d265ee91
Merge: 6232566 2684a71
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 11 20:27:48 2017 +0100

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

 changelog                      | 10 +++++
 patches/apparmor-fixes.diff    | 29 +++++++++++++++
 patches/apparmor-usrmerge.diff | 84 ++++++++++++++++++++++++++++++++++++++++++
 patches/series                 |  2 +
 4 files changed, 125 insertions(+)

diff --cc changelog
index 4a6f40e,3aa72e3..3d409de
--- a/changelog
+++ b/changelog
@@@ -1,22 -1,20 +1,32 @@@
 -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
++ -- 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)
diff --cc patches/series
index fd0adab,d80debf..ad10c56
--- a/patches/series
+++ b/patches/series
@@@ -30,8 -31,13 +30,10 @@@ no-openssl.dif
  disable-some-sc-tests-with-internal-cppunit.diff
  cppunit-optional.diff
  disable-unused-test-programs.diff
 -gb_SUPPRESS_TESTS.diff
 -stop-shipping-mimelnk-desktop-files.diff
 -icu-no-icu-config.diff
 -ww8export-HAVE_MORE_FONTS.diff
 -java9.diff
 -icu-60.diff
 +disable-gbuildtojson.diff
 +disable-tests-somehow-needing-more-fonts.diff
 +tdf108963-test.diff
  apparmor-complain.diff
 +sal-fix-kfreebsd-build.diff
+ apparmor-usrmerge.diff
 -apparmor-updates.diff
+ apparmor-fixes.diff

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