Merge version 1:6.1.5~rc1-2+rpi1 and 1:6.1.5-1 to produce 1:6.1.5-1+rpi1

diff --cc debian/changelog
index 73ae30137b9cb312c209bb285d9a0408387efc4b,a61e69f39346c3882f6c85b3e95846c86ee84522..b3adc52c070c9b35fd14496000b6e28a8ac8e694
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,13 +1,23 @@@
- libreoffice (1:6.1.5~rc1-2+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.1.5-1+rpi1) 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>  Thu, 31 Jan 2019 01:08:24 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 17 Feb 2019 15:13:00 +0000
++
+ libreoffice (1:6.1.5-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+   * debian/patches/tdf123077.diff: add from libreoffice-6-1 branch
+     (closes: #920859)
+   * debian/control.in, debian/rules: recommend fonts-noto-{,ui}-core
+     instead of transitional fonts-noto-hinted (closes: #920960)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 02 Feb 2019 21:49:54 +0000
  
  libreoffice (1:6.1.5~rc1-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge