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

diff --cc debian/changelog
index abc23d76b6f6939a6778b070ecf0618586b06095,83c6e54333f13287ca15f2e9cc8df0cfbbe9bb7c..73ae30137b9cb312c209bb285d9a0408387efc4b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,36 +1,46 @@@
- libreoffice (1:6.1.4-3+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.1.5~rc1-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>  Mon, 07 Jan 2019 00:23:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 31 Jan 2019 01:08:24 +0000
++
+ libreoffice (1:6.1.5~rc1-2) unstable; urgency=medium
+ 
+   * debian/patches/jdk-11.0.2-javadoc.diff: backport from master
+     (closes: #920331)
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 24 Jan 2019 23:49:14 +0100
+ 
+ libreoffice (1:6.1.5~rc1-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   [ Rene Engelhard ]
+   * debian/rules:
+     - add mesa-opencl-icd | beignet-opencl-icd as alternatives to
+       ocl-icd-libopencl1
+ 
+   [ Vincas Dargis ]
+   * debian/patches/apparmor-opencl.diff: Include OpenCL abstractions to fix
+     OpenCL usage in Calc
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 16 Jan 2019 22:00:43 +0100
+ 
+ libreoffice (1:6.1.4-4) unstable; urgency=medium
+ 
+   * debian/control.in: bump recommends for apparmor to >= 2.13.1 and conflict
+     against apparmor (<< 2.13.1~) (closes: #918499)
+   * debian/control.in, debian/rules: make apparmor recommends/conflicts
+     dependant on ENABLE_APPARMOR_PROFILES=y
+   * debian/control.transitonals.in: add missing {misc:Depends} for -ogltrans
+   * debian/control.kde*.in: Replaces: libreoffice-kde (<< 1:6.1.0~alpha1-1)
+     (closes: #919103)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 13 Jan 2019 08:25:12 +0100
  
  libreoffice (1:6.1.4-3) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge