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

diff --cc debian/changelog
index accb97f4a8e6690de83cbe16c605e5b733751234,409c16c1188be9680608e51f84cf37ecd7a1760f..b60ca61b438dedc03c34edd42e7e8d8740a10528
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,20 +1,30 @@@
- libreoffice (1:7.0.0~rc1-5+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:7.0.0~rc2-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, 16 Jul 2020 22:00:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 23 Jul 2020 21:26:29 +0000
++
+ libreoffice (1:7.0.0~rc2-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/control*.in:
+     - fix "compatibility" spelling and one s/package/library/ for consistency.
+     - add explicit depends on liblibreoffice-java for documentation purposes
+   * debian/rules:
+     - symlink oo-ldap.xcd.sample and oo-ad-ldap.xcd.sample to
+       in /etc/libreoffice/registry so that they are not hidden in
+       /usr/lib/libreoffice/share/.registry
+     - move /usr/lib/libreoffice/share/registry/README creation later it rules
+       so that it doesn't get hidden in /usr/lib/libreoffice/share/.registry
+     - fix adding the ucf snippets to zh-CN,zh-TW etc (closes: #964944)
+     - update jh_classpath calls for libreoffice.jar
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 15 Jul 2020 18:31:45 +0000
  
  libreoffice (1:7.0.0~rc1-5) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge