Merge version 1:7.0.1-1+rpi1 and 1:7.0.2-2 to produce 1:7.0.2-2+rpi1

diff --cc debian/changelog
index a209a1b054e3f567a74fd1e0187c88f0570c47ad,9d56f03bbca4bf4d448409e44e0d062d898a7e64..597f2b76151caa321fcc095742a432ccc95757d4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,57 +1,67 @@@
- libreoffice (1:7.0.1-1+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:7.0.2-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
 +  * Disable pdfium, it fails to build for armv6
 +
 +  [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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 05 Sep 2020 11:22:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 18 Oct 2020 13:25:39 +0000
++
+ libreoffice (1:7.0.2-2) unstable; urgency=medium
+ 
+   * debian/control.in:
+     - add Conflicts against pre-7.0 packages with configs (closes: #972043)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 11 Oct 2020 22:34:17 +0200
+ 
+ libreoffice (1:7.0.2-1) unstable; urgency=medium
+ 
+   * LibreOffice 7.0.2 final release (identical to rc2)
+ 
+   * upload to unstable
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 08 Oct 2020 17:23:19 +0200
+ 
+ libreoffice (1:7.0.2~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/oox-crypto-bigendian.diff: add patch from upstream master
+     to fix oox crypto (and thus CppunitTest_sw_ooxmlencryption) on s390x
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 30 Sep 2020 18:43:36 +0200
+ 
+ libreoffice (1:7.0.2~rc1-3) experimental; urgency=medium
+ 
+   * debian/rules:
+     - Actually add missing ifeq "$(DEB_HOST_ARCH)" "armhf"
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 17 Sep 2020 20:28:18 +0200
+ 
+ libreoffice (1:7.0.2~rc1-2) experimental; urgency=medium
+ 
+   * debian/rules:
+     - fix SYSTEM_GCC_VERSION detection
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 17 Sep 2020 20:28:18 +0200
+ 
+ libreoffice (1:7.0.2~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/rules:
+     - also use --disable-skia on armel on buster-backports
+     - force noopt (thus also build with --disable-optimized) on armhf and
+       use default gcc again
+     - stop creating /usr/lib/libreoffice/share/registry/README
+   * debian/libreoffice-common.links.in:
+     debian/libreoffice-common.maintscript: add a symlink
+     /usr/lib/libreoffice/share/registry -> /etc/libreoffice/registry
+     since some software (e.g. LibreOffice Onlines loolwsd) doesn't honour the
+     path set in LOs config (closes: #969653)
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 16 Sep 2020 19:59:51 +0200
  
  libreoffice (1:7.0.1-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge