From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 18 Aug 2019 12:32:36 +0000 (+0100)
Subject: Merge version 1:6.3.0~rc2-1+rpi1 and 1:6.3.0-2 to produce 1:6.3.0-2+rpi1
X-Git-Tag: archive/raspbian/1%6.3.0-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9bdffa6665a93dc35dfbcc89a6d3b373e1147827;p=libreoffice.git

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

9bdffa6665a93dc35dfbcc89a6d3b373e1147827
diff --cc debian/changelog
index 7750e030c25,359f0bf62ce..25418517a4a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,23 +1,33 @@@
- libreoffice (1:6.3.0~rc2-1+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:6.3.0-2+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>  Sun, 18 Aug 2019 12:32:31 +0000
++
+ libreoffice (1:6.3.0-2) unstable; urgency=medium
+ 
+   * debian/rules:
+     - 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
+ 
+   * 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 46d9b7d399a,91f8dfb9f23..347d4310b4e
--- a/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 !armhf !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 !armhf !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
+                fonts-dejavu [!armel !armhf !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
+                fonts-liberation2 [!armel !armhf !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                 g++ (>= 4:7),
                 gcc (>= 4:7),
-                gdb [!kfreebsd-amd64 !kfreebsd-i386 !mips] <!nocheck>,
+                gdb [!armel !armhf !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
 -               ghostscript [!armel !armhf !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                 gobject-introspection (>= 1.32.0),
                 gperf (>= 3.1),
                 gpg <!nocheck>,