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

diff --cc debian/changelog
index 318cfc0542576d1b365088935f61f24237071ba5,abc7e4c677ae07666e7985d5e69111926d53c8df..52345bd1b8a107bdfcb0fdc7f6c0831d3c498c84
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,26 +1,39 @@@
- libreoffice (1:6.0.4-1+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.0.5~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>  Wed, 30 May 2018 22:41:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 05 Jun 2018 06:08:57 +0000
++
+ libreoffice (1:6.0.5~rc1-2) unstable; urgency=medium
+ 
+     - stop special-casing i386 to explicitely use openjdk (9), use default-java
+       again and and appropriate versioned build-depends
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 02 Jun 2018 12:14:04 +0200
+ 
+ libreoffice (1:6.0.5~rc1-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+     - fixes crash on typing any character with IME in Wayland
+       (closes: #898632)
+     - allows rk on .gnupg/random_seed to fix hang on gpg encryption
+       (closes: #899380)
+ 
+   * debian/rules:
+     - optimize the build-indep build a bit more
+       + remove build-indep dependency on build-arch to not run the full
+         testsuite on -A (build-indep) builds.
+         Only run the odk "check" (SDK files) and build-example tests
+       + build without --enable-symbols on build-indep builds
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 31 May 2018 09:13:33 +0000
  
  libreoffice (1:6.0.4-1) unstable; urgency=medium
  

diff --cc debian/control
index 587db28be820da2acfef46272ad1db626360a32e,8ad94af3684ed678874621e9590b3e936fa4e897..bfa77e106593dde23a5d0131a10cb9b772121fc1
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -159,8 -164,8 +160,7 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !m
                 locales [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                 lp-solve (>= 5.5.0.13-5+b1),
                 maven-repo-helper,
-                openjdk-9-jdk (>= 9.0.1+11-1~) [i386],
                 pkg-config,
 -               pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                 python3,
                 python3-dev (>= 3.3),
                 python3-distutils,

diff --cc debian/rules
Simple merge