Manual merge of version 1:5.4.1-1+rpi1 and 1:5.4.2-3 to produce 1:5.4.2-3+rpi1

diff --cc debian/changelog
index 346f09ceda8207e2882c8acd028e884c5a657167,ea0b74aa33970e118b6eb66d0feb67b937d475fa..7ba24ee60fbaea7209adfdb8d89f18c081054572
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,68 +1,78 @@@
- libreoffice (1:5.4.1-1+rpi1) buster-staging; urgency=medium
++libreoffice (1:5.4.2-3+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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 10 Sep 2017 05:13:00 +0000
++ -- Peter Michael Green <pluywash@raspbian.org>  Thu, 26 Oct 2017 15:10:59 +0000
++
+ libreoffice (1:5.4.2-3) unstable; urgency=medium
+ 
+   * debian/patches/ww8export-HAVE_MORE_FONTS.diff, debian/rules: revert
+     change of -2. Actually doesn't work. (Did in a testbuild, but...)
+ 
+  -- Rene Engelhard <rene@debian.org>  Tue, 10 Oct 2017 21:28:41 +0200
+ 
+ libreoffice (1:5.4.2-2) unstable; urgency=medium
+ 
+   * debian/patches/ww8export-HAVE_MORE_FONTS.diff: remove again ...
+   * debian/rules: ... and install LOs fc_local.conf to instdir before make
+     check
+ 
+   * debian/control.{lang,help},in: remove | language-support-translations-*
+     Depends:/Recommends: to unconfuse piuparts
+ 
+  -- Rene Engelhard <rene@debian.org>  Tue, 10 Oct 2017 14:33:23 +0000
+ 
+ libreoffice (1:5.4.2-1) unstable; urgency=medium
+ 
+   * LibreOffice 5.4.2 final release (identical to rc2)
+ 
+   * upload to unstable
+ 
+   * debian/patches/disable-flaky-tests.diff: disable chart2_dump test
+     (closes: #877794)
+   * debian/patches/ww8export-HAVE_MORE_FONTS.diff: temporarily(?) disable
+     testTableKeep test, fails with --without-fonts even though Liberation
+     is in Build-Depends:...
+ 
+   * debian/libreoffice-sdbc-firebird.maintscript: restore, we need it
+     from upgrades involving jessie since jessies version gets kept on
+     jessie->stretch upgrades... (closes: #877494)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 08 Oct 2017 11:38:20 +0200
+ 
+ libreoffice (1:5.4.2~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/control.help.in: drop now obsolete Depends on
+     libreoffice-style-default (closes: #877175)
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 29 Sep 2017 15:33:05 +0200
+ 
+ libreoffice (1:5.4.2~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/icu-no-icu-config.diff: don't use icu-config for
+     determining the ICU version; doesn't exist in (Debian's) ICU 59.1 anymore
+ 
+   * debian/rules:
+     - move STRETCH_BACKPORT conditional for coinmp lower in rules so it
+       gets honoured and make libwps/libmwaw internal unconditionally
+       (RUN_MAKE_CHECK=n on BE archs)...
+     - move images_helpimg.zip to usr/share like the others; remove obsolete
+       helpimg mangling in the "other" images_*.zip
+   * debian/control.in: remove -style-default provides since it doesn't help at
+     all on default changes; depend on tango since that apparently is now the
+     (last) fallback (closes: #874196)
+   * debian/control.gtk?.in: remove -style-tango recommends, obsoleted by
+     above
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 22 Sep 2017 09:21:11 +0200
  
  libreoffice (1:5.4.1-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge