Merge version 1:6.4.1-1+rpi1 and 1:6.4.2-2 to produce 1:6.4.2-2+rpi1

diff --cc debian/changelog
index 6e993a57908ed5923d3a8e929c074bf393465109,96dfd4fb4ee3c4696ed278c9e7b3ac306d2b7229..d67b78169621d76f11fa2367ae26dc866105607a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,81 +1,91 @@@
- libreoffice (1:6.4.1-1+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:6.4.2-2+rpi1) bullseye-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, 02 Mar 2020 04:24:59 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 28 Mar 2020 20:39:47 +0000
++
+ libreoffice (1:6.4.2-2) unstable; urgency=medium
+ 
+   * debian/control.in:
+     - make libreoffice-common Breaks: libreoffice-core (<< 1:6.4.2~rc1)
+       (closes: #954323) 
+     - also add Breaks/Replaces libreoffice-common (<< 1:6.4.2~rc1~) to
+       -nogui (for now)
+     - allow libreoffice-draw-nogui in -impress-noguis Depends:
+       (closes: #954318)
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 20 Mar 2020 15:23:39 +0000
+ 
+ libreoffice (1:6.4.2-1) unstable; urgency=medium
+ 
+   * LibreOffice 6.4.2 final (identical to rc2)
+ 
+   * debian/patches/gengal-message-core.diff: print message and exit with
+     an error if -core-nogui (and not -core) is installed. See #952347
+ 
+   * merge from Ubuntu:
+     - Add armhf to OOO_NOGUI_ARCHS
+ 
+   * upload to unstable 
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 19 Mar 2020 16:01:22 +0100
+ 
+ libreoffice (1:6.4.2~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/tests/control:
+     - make smoketest depend on -writer and -math (not their -nogui variants) 
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 11 Mar 2020 16:21:48 +0000
+ 
+ libreoffice (1:6.4.2~rc1-2) experimental; urgency=medium
+ 
+   * debian/patches/Revert-tdf130839-Corrects-second-level-left-margin-i.patch:
+     remove again.
+ 
+   * debian/tests/control: add missing python3-uno to uitest-cui and missing
+     libreoffice-l10n-{he,ja} to uicheck-uitest tests 
+   * debian/rules:
+     - explicitely build with libboost1.71-dev (and therefore use internal
+       mdds for now) and set BOOST_MINVER= (>= 1.68)
+   * debian/source/include-binaries:
+     - include tarballs/mdds-1.5.0.tar.bz2
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 07 Mar 2020 22:53:34 +0100
+ 
+ libreoffice (1:6.4.2~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/disable-some-sc-tests-with-internal-cppunit.diff:
+     cleanup - remove; affected only internal cppunit and stable(-backports)
+     already builds with system one
+   * debian/patches/Revert-tdf130839-Corrects-second-level-left-margin-i.patch:
+     temporarily revert upstream patch until we either have boost >= 1.68 as
+     default or it can be built with boost < 1.68
+   * debian/patches/sc-disable-UITest_options.diff: temporarily disable options
+     tests, hang (but works in a "normal" system)
+ 
+   * debian/rules:
+     - move soffice.cfg modules to corresponding packages and remove *.ui
+       in the -nogui packages
+     - package breeze_dark_svg and sifr_dark_svg into the respective
+       packages
+     - move /usr/lib/libreoffice/program/postgresql-sdbc.ini to
+       /etc/libreoffice 
+     - remove fonts-alef from FONTS_RECOMMENDS again; no idea where I saw it
+       - it's not in Debian (yet)
+   * debian/control.in:
+     - update for soffice.cfg moves
+   * debian/tests/*: split uicheck into tests per module containing uitests.
+     hopefully helps for arm64 test timeout
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 01 Mar 2020 15:09:06 +0100
  
  libreoffice (1:6.4.1-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge