From: Raspbian forward pporter <root@raspbian.org>
Date: Sun, 22 Apr 2018 15:18:12 +0000 (+0100)
Subject: Merge version 1:5.2.7-1+rpi1+deb9u3 and 1:5.2.7-1+deb9u4 to produce 1:5.2.7-1+rpi1... 
X-Git-Tag: archive/raspbian/1%5.2.7-1+rpi1+deb9u4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6865f33b3b5a5d460a63e730b68dabdae2c2a0a4;p=libreoffice.git

Merge version 1:5.2.7-1+rpi1+deb9u3 and 1:5.2.7-1+deb9u4 to produce 1:5.2.7-1+rpi1+deb9u4
---

66e3406cf95d5815a5360c53208c8264b173ca27
diff --cc debian/changelog
index 816efb73781,2587174821d..1365b88d988
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- libreoffice (1:5.2.7-1+rpi1+deb9u3) stretch-staging; urgency=medium
++libreoffice (1:5.2.7-1+rpi1+deb9u4) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 1:5.2.4-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 07 Jan 2017 01:42:16 +0000]
 +  * Disable chromium stuff as we don't currently have chromium in the Raspbian
 +    repository.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 12 Mar 2018 14:27:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 22 Apr 2018 15:18:08 +0000
++
+ libreoffice (1:5.2.7-1+deb9u4) stretch-security; urgency=high
+ 
+   * debian/patches/CVE-2018-10119.diff,
+     debian/patches/CVE-2018-10120.diff: as name says...
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 18 Apr 2018 17:17:55 +0200
  
  libreoffice (1:5.2.7-1+deb9u3) stretch; urgency=medium