From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 18 Oct 2018 12:57:26 +0000 (+0100)
Subject: Merge version 1:6.1.2-1+rpi1 and 1:6.1.3~rc1-1 to produce 1:6.1.3~rc1-1+rpi1
X-Git-Tag: archive/raspbian/1%6.1.3_rc1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2ca679a04c4385358d570d5f13eba066da6c3629;p=libreoffice.git

Merge version 1:6.1.2-1+rpi1 and 1:6.1.3~rc1-1 to produce 1:6.1.3~rc1-1+rpi1
---

2ca679a04c4385358d570d5f13eba066da6c3629
diff --cc debian/changelog
index c56a3c4ab27,b79f3dd5150..334f3b5416f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,13 +1,26 @@@
- libreoffice (1:6.1.2-1+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.1.3~rc1-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>  Wed, 03 Oct 2018 02:27:03 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Oct 2018 12:57:22 +0000
++
+ libreoffice (1:6.1.3~rc1-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+     - accepts to insert empty field with 'not null' database constraint
+       (closes: #910576)
+ 
+   * debian/patches/DefaultLabel-only-for-interactively-created-OBJs.diff: add
+     from master (closes: #907710)
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 10 Oct 2018 21:25:32 +0000
  
  libreoffice (1:6.1.2-1) unstable; urgency=medium