From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 5 Sep 2020 11:22:46 +0000 (+0100)
Subject: Merge version 1:7.0.1~rc1-2+rpi1 and 1:7.0.1-1 to produce 1:7.0.1-1+rpi1
X-Git-Tag: archive/raspbian/1%7.0.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=64bb7e0875cbb364dde0df605363471bdaeae8db;p=libreoffice.git

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

64bb7e0875cbb364dde0df605363471bdaeae8db
diff --cc debian/changelog
index f1282205f1d,61c4534bd05..a209a1b054e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,16 +1,26 @@@
- libreoffice (1:7.0.1~rc1-2+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:7.0.1-1+rpi1) bullseye-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>  Mon, 31 Aug 2020 21:45:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 05 Sep 2020 11:22:42 +0000
++
+ libreoffice (1:7.0.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+   * debian/liblibreoffice-java.poms: actually add to install the pom...
+   * debian/control.in:
+     - bump ure dependency for -core to (>= 1:7.0.0) (closes: #969244)
+     - remove article from libofficebean-javas Description:
+   * debian/*.lintian-overrides:
+     - override "codeless-jar", manifest-only jar is intended here
+     - update some overrides
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 03 Sep 2020 09:43:55 +0200
  
  libreoffice (1:7.0.1~rc1-2) unstable; urgency=medium