Merge version 1:6.1.5-3+rpi1+deb10u6 and 1:6.1.5-3+deb10u7 to produce 1:6.1.5-3+rpi1...

diff --cc debian/changelog
index fedaab643d69fe6efa641765762863b10797d0f2,b35594ec6215222adcf06f871899821c2bfe0ccb..2422fdf169a7e6c2bf6011d8fe1c8d958f18fc69
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,20 @@@
- libreoffice (1:6.1.5-3+rpi1+deb10u6) buster-staging; urgency=medium
++libreoffice (1:6.1.5-3+rpi1+deb10u7) buster-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>  Sun, 10 May 2020 21:06:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 30 Mar 2021 01:27:11 +0000
++
+ libreoffice (1:6.1.5-3+deb10u7) buster; urgency=medium
+ 
+   * debian/patches/fix-PYTHONPATH.diff: backport upstream fix to
+     not leave a bare trailing : in PYTHONPATH as it causes unconditional
+     loading of encodings.py from . (closes: #984703)
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 08 Mar 2021 13:13:24 +0100
  
  libreoffice (1:6.1.5-3+deb10u6) buster; urgency=medium