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

diff --cc debian/changelog
index b3adc52c070c9b35fd14496000b6e28a8ac8e694,e0263d1eaf21223bf7826017d064c9641db0ad31..11bbfa6fd303b9f1ae3be979ba018d9466f1486a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,19 +1,29 @@@
- libreoffice (1:6.1.5-1+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.1.5-2+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>  Sun, 17 Feb 2019 15:13:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Apr 2019 17:26:06 +0000
++
+ libreoffice (1:6.1.5-2) unstable; urgency=medium
+ 
+   * debian/patches/mention-java-common-package.diff: update message to
+     reflect current config dir...
+   * debian/patches/java.vendor-Debian.diff: make jvmfwk recognize "Debian"
+     as java.vendor as that's what is set in openjdk 11 >= 11.0.3+4-2
+     - see #926009 (closes: #926318)
+ 
+   * debian/control.gtk3.in:
+     - make libreoffice-gtk3 recommend gstreamer1.0-gtk3 (see LP: #1820062)
+   * debian/rules:
+     - remove i386 special-casing for openjdk-8 and -9 from old "stack clash
+       fix broken on i386" days preventing removal openjdk-8
+       (closes: #926281)
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 03 Apr 2019 13:19:34 +0200
  
  libreoffice (1:6.1.5-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge