Merge version 1:6.1.4-1+rpi1 and 1:6.1.4-3 to produce 1:6.1.4-3+rpi1

diff --cc debian/changelog
index cb270c40bab9a085763df4da7af4e4afee7ea3a6,8b2de0f21e53873c9e337fd09bb2eb207b7d6256..abc23d76b6f6939a6778b070ecf0618586b06095
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,22 +1,32 @@@
- libreoffice (1:6.1.4-1+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.1.4-3+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>  Thu, 20 Dec 2018 06:09:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 07 Jan 2019 00:23:12 +0000
++
+ libreoffice (1:6.1.4-3) unstable; urgency=medium
+ 
+   * reupload will full control...
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 31 Dec 2018 22:57:41 +0000
+ 
+ libreoffice (1:6.1.4-2) unstable; urgency=medium
+ 
+   * debian/patches/m68k-fix-parameter-type.patch: as name says,
+     thanks John Paul Adrian Glaubitz (closes: #917539)
+   * debian/patches/lo-xlate-lang-be.diff: belarussian -> belarusian
+     (closes: #917795)
+ 
+   * debian/tests/smoketest: fix
+   * debian/rules: fix libcmis version check (and mysqlcppconn build-dep)
+   * debian/rules, debian/control*in, debian/scripts/gid2pkgdirs.sh:
+     merge -ogltrans into -impress
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 30 Dec 2018 15:25:38 +0000
  
  libreoffice (1:6.1.4-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge