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

diff --cc debian/changelog
index 334f3b5416fc927eb295ccefde4ccdb6cb69ca11,b6a2bc2c66919a239351821717ef809ac04d4c9d..5acdb30426cf01a786a59467ef286ae8f411f333
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,13 +1,26 @@@
- libreoffice (1:6.1.3~rc1-1+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.1.3~rc1-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1:5.2.4-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 07 Jan 2017 01:42:16 +0000]
 +  * Disable chromium stuff as we don't currently have chromium in the Raspbian
 +    repository.
 +  [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, 18 Oct 2018 12:57:22 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Nov 2018 18:27:26 +0000
++
+ libreoffice (1:6.1.3~rc1-2) unstable; urgency=medium
+ 
+   * debian/patches/patches/fix-tests-openjdk11.patch: fix odk examples'
+     build with Java11 (from upstream master)
+ 
+   * debian/tests/control: mark pyuno-import, uno-import, test-extension,
+     test-extension-shared and the dk/util/check.pl and apparmor tests as
+     superficial
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 28 Oct 2018 17:16:36 +0000
  
  libreoffice (1:6.1.3~rc1-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge