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

diff --cc debian/changelog
index 0875ef7de064d5b87c72fc1f13ef6869d7f0f0e0,d7d9d2a6528ca48ac128b3b49a35939f5a271363..3216d5496537ece6ffd73759a2748d2178a7bcf2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,64 +1,74 @@@
- libreoffice (1:7.0.3-4+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:7.0.4-3+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>  Fri, 20 Nov 2020 00:50:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 09 Jan 2021 18:49:45 +0000
++
+ libreoffice (1:7.0.4-3) unstable; urgency=medium
+ 
+   * debian/tests/control.in: *really* add libreoffice-writer dependency
+     to uicheck-sc test
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 03 Jan 2021 18:54:17 +0100
+ 
+ libreoffice (1:7.0.4-2) unstable; urgency=medium
+ 
+   * debian/test/control: make uicheck-sc depend on libreoffice-writer, too
+     (the openDialogs/uno.Show:License Dialog test opens a new "Writer/Web"
+     document...)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 02 Jan 2021 20:17:12 +0100
+ 
+ libreoffice (1:7.0.4-1) unstable; urgency=medium
+ 
+   * LibreOffice 7.0.4 final release (identical to rc2)
+ 
+   * debian/patches/pdfium-m68k.diff: fix pdfium build on m68k
+ 
+   * debian/rules, debian/control*in: s/noinsttests/noinsttest/, thanks
+     lintian
+   * debian/rules:
+     - revert clang (>= 1:11) build-dep for buster-backports; doesn't exist in
+       buster and we resort back to gcc
+     - don't rm LICENSE.html, it is used by
+       Help -> License Information -> Show License
+   * debian/control.mediawiki.in: remove Homepage: (closes: #978713) 
+   * debian/*.mime: stop quoting %s (closes: #950319)
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 31 Dec 2020 13:00:06 +0100
+ 
+ libreoffice (1:7.0.4~rc2-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 09 Dec 2020 20:05:22 +0100
+ 
+ libreoffice (1:7.0.4~rc1-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/unowinreg-static-libgcc.diff: use -static-libgcc, see
+     LO master commit 01241113947fc7bd7f7b765dd897bb023c8ca99c
+ 
+   * debian/rules:
+     - set MYSQL_FLAVOUR=mariadb (as it's used anyway, and upstreams internal
+       copy is mariadb-connector-c anyway) and build-depend on libmariadb-dev
+       instead of libmariadbclient-dev-compat (closes: #975481)
+     - build-depend on clang (>= 1:11) on armel
+     - fix nocheck -b builds...
+     - use nowindows build profile for (not) building unowinreg
+   * debian/rules, debian/control*in:
+     - honour noinsttests build profile for (not) building
+       -subsequentcheckbase/-smoketest-test-data
+   * debian/rules, debian/control*in:
+     - move unowinreg.dll into /usr/lib/i686-w64-mingw32 (the mingw g++
+       compiler installs its .dlls into /usr/lib/gcc/i686-w64-mingw32)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 06 Dec 2020 10:32:01 +0000
  
  libreoffice (1:7.0.3-4) unstable; urgency=medium
  

diff --cc debian/control
index eb41a79b1980d59e683bc153762aea4117a0c144,9c69d96e9190b192aaf822c08ac89ee3d480c478..e4859883dc2dff1429727b7b4b7d088c1ed5c32a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -12,9 -13,9 +13,8 @@@ Build-Depends: apparmor <!nocheck>
                 clang (>= 1:5.0.2) [alpha amd64 arm64 armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el],
                 coinor-libcoinmp-dev (>= 1.8.3-3),
                 coinor-libcoinutils-dev (>= 2.10.14+repack1-1),
 -               debhelper (>= 10.10.4),
                 debhelper-compat (= 12),
                 default-jdk (>= 2:1.9) [!hppa !s390 !sparc !hurd-i386] <!nojava>,
-                default-libmysqlclient-dev,
                 dh-apparmor,
                 dh-python <!nopython>,
                 dpkg-dev (>= 1.18.2~),
@@@ -188,7 -215,7 +189,6 @@@ Build-Depends-Indep: ant (>= 1.7.0) [!h
                       rdfind,
                       symlinks
  Build-Conflicts: amd-libopencl1,
-                  clang [armel],
 -                 fonts-opensymbol <!nocheck>,
                   nvidia-glx-dev,
                   nvidia-glx-legacy-dev,
                   nvidia-libopencl1

diff --cc debian/rules
Simple merge