From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 19 Nov 2019 08:19:45 +0000 (+0000)
Subject: Merge version 1:6.1.5-3+rpi1+deb10u4 and 1:6.1.5-3+deb10u5 to produce 1:6.1.5-3+rpi1... 
X-Git-Tag: archive/raspbian/1%6.1.5-3+rpi1+deb10u5^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d730ffde12b6f024770a11646562e9f63bb0fe5b;p=libreoffice.git

Merge version 1:6.1.5-3+rpi1+deb10u4 and 1:6.1.5-3+deb10u5 to produce 1:6.1.5-3+rpi1+deb10u5
---

d730ffde12b6f024770a11646562e9f63bb0fe5b
diff --cc debian/changelog
index a272bba352b,a78024d8035..f1e03e50602
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,20 @@@
- libreoffice (1:6.1.5-3+rpi1+deb10u4) buster-staging; urgency=medium
++libreoffice (1:6.1.5-3+rpi1+deb10u5) buster-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, 09 Sep 2019 13:56:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 19 Nov 2019 08:19:41 +0000
++
+ libreoffice (1:6.1.5-3+deb10u5) buster; urgency=medium
+ 
+   * debian/patches/Postgresql-12-no-adsrc.diff: add from
+     libreoffice-6-3 branch; fix the postgresql driver with
+     PostgreSQL 12 (closes: #943873)
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 31 Oct 2019 18:26:41 +0100
  
  libreoffice (1:6.1.5-3+deb10u4) buster-security; urgency=medium