[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 748a75247a9fd49f23a29695919fef255710d0ce
Merge: 04e489f 4f7eeed
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 8 00:05:13 2017 +0100

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

 README.Debian | 18 ++++++++++++++++++
 changelog     |  9 ++++++++-
 control       |  1 +
 control.in    |  1 +
 rules         |  6 ++++++
 5 files changed, 34 insertions(+), 1 deletion(-)

diff --cc changelog
index 388b2ea,2e953f6..b997725
--- a/changelog
+++ b/changelog
@@@ -1,57 -1,48 +1,64 @@@
 -libreoffice (1:5.4.4~rc1-1) UNRELEASED; urgency=medium
 +libreoffice (1:6.0.0~beta2~git20171207-1) UNRELEASED; urgency=medium
  
+   [ Rene Engelhard ]
 -  * New upstream release candidate
 +  * New upstream snapshot
  
    * 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/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/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
+     - stop installing disabled symlinks for apparmor (closes: #883800)
      - actually install the OpenSymbol fontconfig snippet into a 
        /etc/fonts.d/30_opensymbol.conf
 -    - change BRAND_BASE_DIR in fundamentalrc so that we don't get
 -      /usr/lib/libreoffice/program/../program/xpdfimport calls. We know
 -      the path and the apparmor profile doesn't allow this
    * debian/libreoffice-common.bug-script.in: run aa-status
+   * debian/control.in: add gnupg to Suggests
+ 
+   [ intrigeri ]
+   * debian/README.Debian: document how to debug and customize the included
+     AppArmor profiles
+ 
 - -- Rene Engelhard <rene at debian.org>  Thu, 07 Dec 2017 23:24:31 +0100
  
 -libreoffice (1:5.4.3-4) unstable; urgency=medium
 + -- Rene Engelhard <rene at debian.org>  Mon, 04 Dec 2017 19:01:27 +0100
  
 -  * 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
 +libreoffice (1:6.0.0~beta1-2) experimental; urgency=medium
  
 - -- Rene Engelhard <rene at debian.org>  Sat, 02 Dec 2017 01:01:41 +0100
 +  * 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
  
 -libreoffice (1:5.4.3-3) unstable; urgency=medium
 +  * merge from Ubuntu:
 +    - debian/patches/fix-includes-in-aarch64-bridge.patch: add from master
  
 -  * debian/patches/icu-60.diff: backport icu 60 support patch 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
 +
 +  * New upstream beta release
 +
 +  * debian/patches/ww8export-HAVE_MORE_FONTS.diff: move ...
 +  * debian/patches/disable-tests-somehow-needing-more-fonts.diff: ... here
 +    and patch also ooxmlexport4
  
    * debian/rules:
 +    - use (dh_)dwz and (if enabled) install the multifile file into
 +      uno-libs3-dbgsym.
 +      Thanks Matthias Klose for the hint.
 +      Make *-dbgsym depend on uno-libs3-dbgsym which should contain the above
 +      file and is recommended anyway because of the gdb helpers.
 +    - be consequent and enable the junit tests on arm64 now that
 +      those work.
 +    - stop passing --disable-database-connectivity for no-Base archs
 +      (closes: #874274)
 +    - explicitly use and depend on openjdk 9 on i386 now that #876069 is fixed.
      - replace some manual dpkg-parsechangelog calls with
        $(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for
        --disable-dependency-tracking

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