From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 16 Dec 2019 16:05:06 +0000 (+0000)
Subject: Merge version 1:6.3.3-3+rpi1 and 1:6.3.4-2 to produce 1:6.3.4-2+rpi1
X-Git-Tag: archive/raspbian/1%6.3.4-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b6f09275602e647282a658988afdb4fedbd7ca7e;p=libreoffice.git

Merge version 1:6.3.3-3+rpi1 and 1:6.3.4-2 to produce 1:6.3.4-2+rpi1
---

b6f09275602e647282a658988afdb4fedbd7ca7e
diff --cc debian/changelog
index 5448869c5f1,123c3242635..6e30dedd7f5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,22 +1,32 @@@
- libreoffice (1:6.3.3-3+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:6.3.4-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 24 Nov 2019 13:38:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 16 Dec 2019 16:05:00 +0000
++
+ libreoffice (1:6.3.4-2) unstable; urgency=medium
+ 
+   * reupload with full languages in control...
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 12 Dec 2019 22:52:05 +0100
+ 
+ libreoffice (1:6.3.4-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+   * debian/patches/fix-build-with-poppler-0.83.diff: as name says
+ 
+   * debian/rules:
+     - add hyphen-en-us <!nocheck> to Build-Depends; used by writer tests
+ 
+   * merge from Ubuntu:
+     - Recommend fonts-noto-extra (fixes various Impress templates)
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 05 Dec 2019 21:03:51 +0100
  
  libreoffice (1:6.3.3-3) unstable; urgency=medium
  
diff --cc debian/control
index bcbf171967d,8273b061d16..57435ff1b9b
--- a/debian/control
+++ b/debian/control
@@@ -37,8 -38,12 +37,9 @@@ Build-Depends: apparmor <!nocheck>
                 gpg <!nocheck>,
                 gpg-agent <!nocheck>,
                 gpgconf <!nocheck>,
 -               hunspell-en-us [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
+                hyphen-en-us [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
 -               imagemagick [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                 java-common (>= 0.61),
                 javahelper (>= 0.37~),
 -               junit4 (>= 4.8.2-2) [amd64 arm64] <!nocheck>,
                 libabw-dev (>= 0.1),
                 libarchive-zip-perl [!hppa !mips64 !s390 !sparc],
                 libavahi-client-dev,