Manual merge of version 1:5.3.5~rc1-3+rpi1 and 1:5.4.0-1 to produce 1:5.4.0-1+rpi1

diff --cc debian/changelog
index f88d4100796723cbe08e0ea4d0f3a041a1ed1ec7,4282074091eebcf042c6736562e408f789f121eb..43017d920828b2090e14ce743133914710c4b454
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,8 +1,16 @@@
- libreoffice (1:5.3.5~rc1-3+rpi1) buster-staging; urgency=medium
++libreoffice (1:5.4.0-1+rpi1) buster-staging; urgency=medium
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 27 Jul 2017 23:16:27 +0000
- 
- libreoffice (1:5.3.5~rc1-3) unstable; urgency=medium
- 
-   * debian/tests/control: add more test Depends: for sdk-examples:
-     libx11-dev, libxt-dev (we don't use @builddeps@ here yet)
- 
-  -- Rene Engelhard <rene@debian.org>  Fri, 21 Jul 2017 11:17:32 +0200
- 
- libreoffice (1:5.3.5~rc1-2) unstable; 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.
 +
-   * reupload with fixed changelog (broken cherry-pick)
++ -- Peter Michale Green <plugwash@raspbian.org>  Mon, 07 Aug 2017 05:42:17 +0000
 +
-  -- Rene Engelhard <rene@debian.org>  Tue, 18 Jul 2017 08:10:51 +0200
+ libreoffice (1:5.4.0-1) unstable; urgency=medium
  
- libreoffice (1:5.3.5~rc1-1) unstable; urgency=medium
+   * New upstream release
  
-   * New upstream release candidate
+   * upload to unstable
  
    * debian/patches/examples-fix-SDK_AUTO_DEPLOYMENT-check.diff: don't try
      to do "auto deployment" when SDK_AUTO_DEPLOYMENT = NO...

diff --cc debian/control
index 840a9e3c9714a803a6c1e1a007faaea490146979,43aa72885332c13f2295ade9912fce76cdc770c6..a3fd06b068bf015d6e249c6fe5673f38285a4ff6
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -132,9 -146,12 +143,10 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i
                 lp-solve (>= 5.5.0.13-5+b1),
                 make (>= 3.81-8.2),
                 maven-repo-helper,
 -               opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 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),
 -               rapidjson-dev [amd64 i386],
                 ucpp,
                 unixodbc-dev (>= 2.2.11),
                 unzip,