Merge version 1:7.0.0~rc2-1+rpi1 and 1:7.0.1~rc1-1 to produce 1:7.0.1~rc1-1+rpi1

diff --cc debian/changelog
index b60ca61b438dedc03c34edd42e7e8d8740a10528,d3ac80fdbeae184d70a2316fbdd36a6f98617563..1963226ad3bb1b7a8904d0122b6ee9816e778f63
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,30 +1,40 @@@
- libreoffice (1:7.0.0~rc2-1+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:7.0.1~rc1-1+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>  Thu, 23 Jul 2020 21:26:29 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 17 Aug 2020 03:23:15 +0000
++
+ libreoffice (1:7.0.1~rc1-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/fix-build-with-cppunit-1.14.0.diff: as name says
+   * debian/rules: bump libnumbertext build-dep to 1.0.6 and use internal
+     libnumbertext for buster-backports
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 07 Aug 2020 19:30:24 +0200
+ 
+ libreoffice (1:7.0.0-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - reverts the "Personal edition" nonsense (closes: #965235)
+ 
+   * debian/patches/no-opencl-per-default.diff: as name says, disable OpenCL
+     per default. Prompted by
+     https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=954849#41 ff.
+   * debian/tests/control: use libreoffice-l10n-zh-tw instead of
+     libreoffice-l10n-ja to test a xx-YY locale so that stuff like #964944
+     is noticed.
+   * debian/rules:
+     - remove Education;Science; from libreoffice-math.desktop (closes: #965338) 
+     - build-depend on qtchoser and export QT_SELECT_5 (again) for
+       buster-backports
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 01 Aug 2020 15:02:40 +0200
  
  libreoffice (1:7.0.0~rc2-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge