From: Raspbian forward pporter <root@raspbian.org>
Date: Sat, 22 Sep 2018 12:01:07 +0000 (+0100)
Subject: Merge version 1:6.1.1~rc1-2+rpi1 and 1:6.1.1-1 to produce 1:6.1.1-1+rpi1
X-Git-Tag: archive/raspbian/1%6.1.1-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0d2472cba91cc8d820b8afa75220bc81349fca72;p=libreoffice.git

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

950145f6a239a5d675abbb942efc3d4b1e3d7a23
diff --cc debian/changelog
index 91b0ee52999,638edc59965..c96b23c4e15
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,12 +1,25 @@@
- libreoffice (1:6.1.1~rc1-2+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.1.1-1+rpi1) buster-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.
 +  [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>  Tue, 04 Sep 2018 17:32:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 22 Sep 2018 12:01:04 +0000
++
+ libreoffice (1:6.1.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+   * debian/patches/fix-gtk3_kde5-filepicker-infinite-loop.diff: add from
+     libreoffice-6-1 branch: fixes possible infinite loop in gtk3_kde5
+     filepicker (closes: #906987)
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 10 Sep 2018 23:38:40 +0200
  
  libreoffice (1:6.1.1~rc1-2) unstable; urgency=medium