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

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

680b3ccc1a60e5a324616c02454a6125b4bb97e1
diff --cc debian/changelog
index 11bbfa6fd30,5b94c7cbd6d..9a6583c12ca
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- libreoffice (1:6.1.5-2+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.1.5-3+rpi1) 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>  Sun, 07 Apr 2019 17:26:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 15 Apr 2019 14:05:12 +0000
++
+ libreoffice (1:6.1.5-3) unstable; urgency=medium
+ 
+   * debian/patches/jp-JP-Reiwa.diff: Introduce next Japanese gengou
+     era 'Reiwa', from libreoffice-6-1 branch
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 11 Apr 2019 22:39:53 +0200
  
  libreoffice (1:6.1.5-2) unstable; urgency=medium