From: Raspbian forward pporter <root@raspbian.org>
Date: Sun, 15 Jul 2018 15:05:16 +0000 (+0100)
Subject: Merge version 1:6.0.5-1+rpi1 and 1:6.0.6~rc1-1 to produce 1:6.0.6~rc1-1+rpi1
X-Git-Tag: archive/raspbian/1%6.0.6_rc1-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5caab3f2a199dad7d7fc7f8ad05c072b50fffdf9;p=libreoffice.git

Merge version 1:6.0.5-1+rpi1 and 1:6.0.6~rc1-1 to produce 1:6.0.6~rc1-1+rpi1
---

66ea0b37d9880046b97f72afca123333e455af37
diff --cc debian/changelog
index 6184a4ef4db,df08a6b13ae..3a7793a0913
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,12 +1,25 @@@
- libreoffice (1:6.0.5-1+rpi1) buster-staging; urgency=medium
++libreoffice (1:6.0.6~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>  Tue, 26 Jun 2018 23:10:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 15 Jul 2018 15:05:13 +0000
++
+ libreoffice (1:6.0.6~rc1-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/rules:
+     - fix PYTHON_VERSION override to work again;
+       export PYTHON_{CFLAGS,LIBS} ourselves
+ 
+  -- Rene Engelhard <rene@debian.org>  Tue, 10 Jul 2018 19:07:55 +0000
  
  libreoffice (1:6.0.5-1) unstable; urgency=medium