Manual merge of version 1:6.1.5-3+rpi1 and 1:6.3.0~rc2-1 to produce 1:6.3.0~rc2-1...

diff --cc debian/changelog
index 9a6583c12caa0464f7d99029bcee5ecfd49188ad,9802d286a9132b95209527be5334affd6c8e7542..7750e030c257a04be2b6c936f4b0ed58f2b45efc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,111 +1,121 @@@
- libreoffice (1:6.1.5-3+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.3.0~rc2-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 15 Apr 2019 14:05:12 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 27 Jul 2019 19:08:33 +0000
 +
- libreoffice (1:6.1.5-3) unstable; urgency=medium
+ libreoffice (1:6.3.0~rc2-1) unstable; urgency=medium
  
-   * debian/patches/jp-JP-Reiwa.diff: Introduce next Japanese gengou
-     era 'Reiwa', from libreoffice-6-1 branch
+   * New upstream release candidate
+ 
+   * debian/rules:
+     - remove build paths in test.jars Class-Path:
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 21 Jul 2019 19:55:13 +0200
+ 
+ libreoffice (1:6.3.0~rc1-2) unstable; urgency=high
+ 
+   * mention fixed security bugs in 1:6.3.0~beta2-1
+   * make upload urgency=high because of the above
+ 
+   * debian/control.in:
+     - move librelogo from Recommends to Suggests
+     - bump math depends on fonts-opensymbol to >= 2:102.11
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 17 Jul 2019 06:12:01 +0200
+ 
+ libreoffice (1:6.3.0~rc1-1) unstable; urgency=medium
+   
+   * New upstream release candidate
+ 
+   * upload to unstable
+ 
+   * merge from Ubuntu:
+     - debian/patches/fix-flaky-bridgetest.diff: add safer float
+       comparisons to bridgetest equals() (LP: 1832360)
+ 
+   * debian/control.qt5.in:
+     - recommend qtgstreamer-plugins-qt5
+   * debian/rules:
+     - handle java version suffixes (strip them), e.g. "-ea"
+     - disable vlc avmedia plugin (bitrotting, unsupported on linux,
+       low popcon
+   * debian/rules, debian/control.in:
+       and merge -avmedia-gstreamer into -core now that it is the
+       only alternative
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 07 Jul 2019 18:37:57 +0000
+ 
+ libreoffice (1:6.3.0~beta2-2) experimental; urgency=medium
+ 
+   * debian/patches/link-with-latomic-on-mips-el-armel-powerpc.diff:
+     as name says 
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 22 Jun 2019 10:39:57 +0200
+ 
+ libreoffice (1:6.3.0~beta2-1) experimental; urgency=medium
+ 
+   * New upstream beta release
+     - fixes CVE-2019-9848 and CVE-2019-9848
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 21 Jun 2019 19:09:23 +0200
+ 
+ libreoffice (1:6.3.0~beta1-2) experimental; urgency=medium
+ 
+   * debian/patches/0cf4e7f.diff: add from gerrit, fixes 32bit build for the
+     Qt5 plugin
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 02 Jun 2019 20:54:17 +0200
+ 
+ libreoffice (1:6.3.0~beta1-1) experimental; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 01 Jun 2019 11:43:39 +0200
+ 
+ libreoffice (1:6.3.0~alpha1-2) experimental; urgency=medium
+ 
+   * debian/patches/c579879.diff: add from gerrit, fixes 32bit build for the
+     Qt5 plugin
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 15 May 2019 18:12:04 +0200
  
-  -- Rene Engelhard <rene@debian.org>  Thu, 11 Apr 2019 22:39:53 +0200
+ libreoffice (1:6.3.0~alpha1-1) experimental; urgency=medium
  
- libreoffice (1:6.1.5-2) unstable; urgency=medium
+   * New upstream alpha release
+     - now has ui prompt for printer authentication (closes: #795929)
+ 
+   * debian/rules:
+     - export JAVA_{SOURCE,TARGET}_VER to 1.7 if building with Java >= 12
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 13 May 2019 20:00:56 +0200
+ 
+ libreoffice (1:6.2.4~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+     - supports JRE installations with unknown java.vendor property
+ 
+   * debian/patches/java.vendor-Debian.diff: remove again as upstream now
+     accepts unknown JDKs
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 05 May 2019 21:08:43 +0200
+ 
+ libreoffice (1:6.2.3~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/rules:
+     - replace various $(findstring for arch checks by $(filter
+ 
+  -- Rene Engelhard <rene@debian.org>  Tue, 16 Apr 2019 22:25:38 +0200
+ 
+ libreoffice (1:6.2.3~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
  
    * debian/patches/mention-java-common-package.diff: update message to
      reflect current config dir...

diff --cc debian/control
index 770be00e12f01eb3e8be2cf45d5977202556a945,6ea09f127316909c433ded2b3b667e2bebe45f5b..46d9b7d399aad588e59a03f9aaa57d59853dae3d
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -25,16 -25,17 +25,16 @@@ 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 [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
+                fontconfig [!kfreebsd-amd64 !kfreebsd-i386 !mips] <!nocheck>,
                 fontforge-nox | fontforge,
-                fonts-crosextra-carlito [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
-                fonts-dejavu [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
-                fonts-liberation2 [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
-                g++ (>= 4:7) [m68k],
-                gcc (>= 4:7) [m68k],
-                gdb [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
+                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>,
+                g++ (>= 4:7),
+                gcc (>= 4:7),
+                gdb [!kfreebsd-amd64 !kfreebsd-i386 !mips] <!nocheck>,
 -               ghostscript [!kfreebsd-amd64 !kfreebsd-i386 !mips] <!nocheck>,
                 gobject-introspection (>= 1.32.0),
-                gperf,
+                gperf (>= 3.1),
                 gpg <!nocheck>,
                 gpg-agent <!nocheck>,
                 gpgconf <!nocheck>,
@@@ -56,11 -59,12 +55,11 @@@
                 libcairo2-dev,
                 libcdr-dev (>= 0.1),
                 libclucene-dev (>= 2.3.3.4-4.1),
-                libcmis-dev (>= 0.5.0-3),
+                libcmis-dev (>= 0.5.2~),
                 libcommons-logging-java [!hppa !mips64 !s390 !sparc],
 -               libcppunit-dev (>= 1.14) [!kfreebsd-amd64 !kfreebsd-i386 !mips] <!nocheck>,
                 libcups2-dev,
                 libcurl4-gnutls-dev,
-                libdbus-glib-1-dev (>= 0.70),
+                libdbus-1-dev (>= 0.60),
                 libdconf-dev (>= 0.15.2),
                 libe-book-dev,
                 libe-book-dev (>= 0.1.2) <!nocheck>,
@@@ -166,9 -168,11 +163,9 @@@
                 lp-solve (>= 5.5.0.13-5+b1),
                 maven-repo-helper,
                 pkg-config,
 -               pstoedit [!kfreebsd-amd64 !kfreebsd-i386 !mips] <!nocheck>,
                 python3,
-                python3-dev (>= 3.3),
-                python3-distutils,
+                python3-dev (>= 3.3) <!nopython>,
+                python3-distutils <!nopython>,
 -               python3-lxml <!nocheck !nopython>,
                 qt5-qmake (>= 5.6),
                 qtbase5-dev (>= 5.6),
                 qtbase5-dev-tools (>= 5.6),

diff --cc debian/rules
index 4a3c490019ec40e2562091ccf262f607a2fe3656,088310599db1003b561c0c465b93a78435c4e66d..dca6a1ed980219dbd4891bdadebe8e797359f618
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -521,8 -467,8 +469,8 @@@ PLATFORMID := $(shell grep PLATFORMID d
  
  # let's do this only on archs where we have chromium, which is supposedly even only the archs
  # where alsp pdfium is supported.
 -OOO_PDFIUM_ARCHS := i386 amd64 armhf arm64
 +OOO_PDFIUM_ARCHS := i386 amd64 arm64
- ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS)))
+ ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS)))
  ENABLE_PDFIUM=y
  else
  ENABLE_PDFIUM=n