Merge version 1:5.4.4-1+rpi1 and 1:6.0.0-1 to produce 1:6.0.0-1+rpi1

diff --cc debian/changelog
index 56fbc8982076abdd01771ce7fa76138cc570c5db,a01d5e3702a011df6ba2ba390daf6b01e95ecaf0..df1771be41d388bb113e83a329d7e7fd1d81faf3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,65 +1,75 @@@
- libreoffice (1:5.4.4-1+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.0.0-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1:5.2.4-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 07 Jan 2017 01:42:16 +0000]
 +  * Disable chromium stuff as we don't currently have chromium in the Raspbian
 +    repository.
 +  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
 +  * Disable pdfium, it fails to build for armv6
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 31 Dec 2017 14:02:24 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 08 Feb 2018 05:25:22 +0000
 +
- libreoffice (1:5.4.4-1) unstable; urgency=medium
+ libreoffice (1:6.0.0-1) unstable; urgency=medium
  
-   [ Rene Engelhard ]
-   * New upstream release
-     - colours referenced cells again (closes: #883254)
-     - doesn't crash anymore when clicking in the Input Line of a
-       protected cell (closes: #884149)
+   * LibreOffice 6.0.0 final release (identical to rc3)
+ 
+   * upload to unstable
+ 
+   * debian/patches/glm-0.9.9.diff: fix build with glm 0.9.9 (closes: #888737)
+ 
+   * merge from Ubuntu:
+     - debian/patches/apparmor-fixes.diff: allow JVM execution
+ 
+   * debian/rules:
+     - re-enable system-glm; bump libglm-dev build-depdendency to
+       libglm-dev (>= 0.9.9~a2) when using gcc >= 7.3
+     - re-enable -systray. Actually in stock 6.0 upstream debs the feature *is
+       still in the options...
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 29 Jan 2018 18:52:54 +0100
+ 
+ libreoffice (1:6.0.0~rc3-2) experimental; urgency=medium
+ 
+   * debian/patches/disable-flaky-tests.diff: disable ODFEncryptiomGPG test;
+     the signing parts work, so...
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 27 Jan 2018 14:37:23 +0100
+ 
+ libreoffice (1:6.0.0~rc3-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/apparmor-fixes.diff: add patch from master with syntax
+     fixes. Also include X abstractions and allow .mozilla/firefox/** reading
+   * debian/patches/apparmor-updates.diff: more gpg stuff: gpg(sm), .gnupg/*
+   (both together closes: #887593)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 27 Jan 2018 11:36:59 +0100
+ 
+ libreoffice (1:6.0.0~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/poppler-0.62.diff: backport from master to fix build with
+     poppler 0.62
+ 
+   * debian/rules:
+     - rename 30_opensymbol.conf to 30-opensymbol.conf for consistency
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 11 Jan 2018 23:05:44 +0100
+ 
+ libreoffice (1:6.0.0~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+     - fixes keyboard navigation for textboxes in slide layout (closes: #870387)
+     - fixes Glue points in Draw (closes: #883989)
  
-   * 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...
    * debian/rules:
-     - 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
      - stop passing --disable-report-builder to build-archs configure since
        even though it's built the report builder doesn't work then. Move
        from Build-Depends-Indep: to Build-Depends: again (closes: #875688);

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge