From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 28 Jun 2020 17:22:54 +0000 (+0100)
Subject: Merge version 1:6.4.4-1+rpi1 and 1:6.4.5~rc1-2 to produce 1:6.4.5~rc1-2+rpi1
X-Git-Tag: archive/raspbian/1%6.4.5_rc1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f60b0c86dd64fb6c382e665f4514c6372b0931f1;p=libreoffice.git

Merge version 1:6.4.4-1+rpi1 and 1:6.4.5~rc1-2 to produce 1:6.4.5~rc1-2+rpi1
---

f60b0c86dd64fb6c382e665f4514c6372b0931f1
diff --cc debian/changelog
index 7b070101e6b,b48279850ff..b244cf40e51
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,23 +1,33 @@@
- libreoffice (1:6.4.4-1+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:6.4.5~rc1-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>  Thu, 28 May 2020 15:55:03 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 28 Jun 2020 17:22:50 +0000
++
+ libreoffice (1:6.4.5~rc1-2) unstable; urgency=medium
+ 
+   * debian/patches/apparmor-cleanups.diff: #include <abstractions/user-tmp>
+     (closes: #962903)
+   * debian/rules:
+     - re-enable CoinMP
+  
+  -- Rene Engelhard <rene@debian.org>  Sun, 21 Jun 2020 13:07:16 +0200
+ 
+ libreoffice (1:6.4.5~rc1-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+     - sets A4 in extras/source/shellnew templates (closes: #961473)
+     - fixes signing existing PDFs (closes: #955272)
+ 
+   * debian/rules:
+     - use default libboost*-dev (>= 1.71) in gcc 10 case now that we have
+       a matching default boost
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 11 Jun 2020 17:40:43 +0200
  
  libreoffice (1:6.4.4-1) unstable; urgency=medium
  
diff --cc debian/control
index 179269cd6c0,83d41bafc23..bf67c855e0f
--- a/debian/control
+++ b/debian/control
@@@ -9,6 -9,9 +9,8 @@@ Build-Depends: apparmor <!nocheck>
                 bc,
                 bison,
                 bzip2,
+                coinor-libcoinmp-dev (>= 1.8.3-3),
+                coinor-libcoinutils-dev (>= 2.10.14+repack1-1),
 -               debhelper (>= 10.10.4),
                 debhelper-compat (= 12),
                 default-jdk (>= 2:1.8) [!hppa !s390 !sparc !hurd-i386 !i386] <!nojava>,
                 default-jdk (>= 2:1.8-55) [sparc64] <!nojava>,