Merge version 1:7.0.4-3+rpi1 and 1:7.0.4-4 to produce 1:7.0.4-4+rpi1

diff --cc debian/changelog
index 3216d5496537ece6ffd73759a2748d2178a7bcf2,10fb0d0b20e3147740a27c07b724e3a0ba752179..8cc5d44abb54c7b680efb338d6f19d85154fb1a0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,19 +1,29 @@@
- libreoffice (1:7.0.4-3+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:7.0.4-4+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Fri, 27 Apr 2018 02:14:18 +0000]
 +  * Disable testsuite.
 +
 +  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
 +  * Disable pdfium, it fails to build for armv6
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 09 Jan 2021 18:49:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 27 May 2021 20:37:32 +0000
++
+ libreoffice (1:7.0.4-4) unstable; urgency=medium
+ 
+   * debian/patches/apparmor-updates.diff: allow one more digit in temp
+     files (closes: #982274)
+   * debian/control.in, debian/libreoffice-common.{maintscript,postinst.in}:
+     apply patch from Adreas Beckmann to fix upgrade buster->bullseye
+     - libreoffice-core: Copy some Conflicts from libreoffice-common for smoother
+       upgrades from buster. Dpkg will otherwise ignore Conflicts that are
+       encountered later against a package that is already deconfigured.
+     - libreoffice-common: Do not use dir_to_symlink for
+       /usr/lib/libreoffice/share/registry, the Breaks/Conflicts cascade does not
+       work reliable here to ensure all packages previously shipping files there
+       are either removed or upgraded first, but not just deconfigured. Fix up
+       the symlink in postinst instead.  (Closes: #985297)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 01 May 2021 13:50:48 +0200
  
  libreoffice (1:7.0.4-3) unstable; urgency=medium
  

diff --cc debian/control
Simple merge