Merge version 1:6.3.0~rc2-1+rpi1 and 1:6.3.1-1 to produce 1:6.3.1-1+rpi1

diff --cc debian/changelog
index 7750e030c257a04be2b6c936f4b0ed58f2b45efc,b678d936e055369b07dcbb55b0f38b81adfd86ea..bf9b4f796827918e1b5d701ad99fb01e6b3cf5d4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,63 +1,73 @@@
- libreoffice (1:6.3.0~rc2-1+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:6.3.1-1+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 27 Jul 2019 19:08:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Sep 2019 02:32:01 +0000
++
+ libreoffice (1:6.3.1-1) unstable; urgency=medium
+ 
+   * LibreOffice 6.3.1 final release (identical to rc2)
+ 
+   * debian/patches/set-Wl-no-as-needed-for-latomic.diff: move ...
+   * debian/patches/latomic.diff: ... here and replace by full configure
+     check
+ 
+   * debian/rules:
+     - re-enable make check on armhf 
+     - explicitely build with --with-linker-hash-style=sysv on mips*,
+       thanks Aurelien Jarno
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 02 Sep 2019 19:17:30 +0200
+ 
+ libreoffice (1:6.3.1~rc2-3) unstable; urgency=medium
+ 
+   * debian/patches/set-Wl-no-as-needed-for-latomic.diff: as name says,
+     we need -Wl,--no-as-needed for -latomic (and gcc9 defaults to
+     --as-needed..), thanks Adam Borowski
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 30 Aug 2019 20:24:22 +0200
+ 
+ libreoffice (1:6.3.1~rc2-2) unstable; urgency=medium
+ 
+   * reupload with complete control... 
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 30 Aug 2019 18:29:31 +0200
+ 
+ libreoffice (1:6.3.1~rc2-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+     - fixes Help-About with gtk2 plugin (closes: #934779)
+ 
+   * debian/control.in:
+     - add kn and ne to libreoffice-l10n-ins depends (closes: #935632)
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 30 Aug 2019 06:28:53 +0200
+ 
+ libreoffice (1:6.3.0-2) unstable; urgency=medium
+ 
+   * debian/control.in:
+     - make -core Conflicts: against libreoffice-mysql-connector (<< 1:6.2.0~)
+       (closes: #933835)
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 09 Aug 2019 19:20:41 +0200
+ 
+ libreoffice (1:6.3.0-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - fixes CVE-2019-9850/CVE-2019-9851/CVE-2019-9852
+ 
+   * merge from Ubuntu:
+     - patches/fix-uicheck-tests-on-i386.patch: fix rounding errors on i386 
+ 
+   * debian/rules:
+     - be consequent and disable mergelibs and -g on i386, too
+     - disable running make check on mipsel, mips64el, armel, armhf
+ 
+  -- Rene Engelhard <rene@debian.org>  Tue, 06 Aug 2019 19:44:20 +0200
  
  libreoffice (1:6.3.0~rc2-1) unstable; urgency=medium
  

diff --cc debian/control
index 46d9b7d399aad588e59a03f9aaa57d59853dae3d,9dd6bc2323b042859fae3181c26aa64b26cafdfa..15ec6eb09f2371ec055f654eeeec657e5e040331
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -25,14 -24,15 +24,14 @@@ Build-Depends: apparmor <!nocheck>
                 firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !mips64 !s390 !sparc],
                 firebird3.0-server-core [!hppa !mips64 !s390 !sparc] <!nocheck>,
                 flex (>= 2.3.35),
-                fontconfig [!kfreebsd-amd64 !kfreebsd-i386 !mips] <!nocheck>,
+                fontconfig [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                 fontforge-nox | fontforge,
-                fonts-crosextra-carlito [!kfreebsd-amd64 !kfreebsd-i386 !mips] <!nocheck>,
-                fonts-dejavu [!kfreebsd-amd64 !kfreebsd-i386 !mips] <!nocheck>,
-                fonts-liberation2 [!kfreebsd-amd64 !kfreebsd-i386 !mips] <!nocheck>,
+                fonts-crosextra-carlito [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
+                fonts-dejavu [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
+                fonts-liberation2 [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                 g++ (>= 4:7),
                 gcc (>= 4:7),
-                gdb [!kfreebsd-amd64 !kfreebsd-i386 !mips] <!nocheck>,
+                gdb [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
 -               ghostscript [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                 gobject-introspection (>= 1.32.0),
                 gperf (>= 3.1),
                 gpg <!nocheck>,

diff --cc debian/rules
Simple merge