From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 12 May 2023 10:02:05 +0000 (+0100)
Subject: Merge version 1:7.0.4-4+rpi1+deb11u3 and 1:7.0.4-4+deb11u6 to produce 1:7.0.4-4+rpi1... 
X-Git-Tag: archive/raspbian/1%7.0.4-4+rpi1+deb11u6^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3582c3a0e40b2b731fd0e2dcdb4cd7e941a2388f;p=libreoffice.git

Merge version 1:7.0.4-4+rpi1+deb11u3 and 1:7.0.4-4+deb11u6 to produce 1:7.0.4-4+rpi1+deb11u6
---

3582c3a0e40b2b731fd0e2dcdb4cd7e941a2388f
diff --cc debian/changelog
index 965e46a80bc,601c1ebb405..fc62192b5eb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,21 +1,31 @@@
- libreoffice (1:7.0.4-4+rpi1+deb11u3) bullseye-staging; urgency=medium
++libreoffice (1:7.0.4-4+rpi1+deb11u6) bullseye-staging; urgency=medium
 +
 +  [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.
 +
 +  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
 +  * Disable pdfium, it fails to build for armv6
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 12 Sep 2022 00:42:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 12 May 2023 10:01:41 +0000
++
+ libreoffice (1:7.0.4-4+deb11u6) bullseye; urgency=medium
+ 
+   * debian/patches/avoid-empty-java.class.path.diff: apply upstream patch
+     avoiding empty -Djava.class.path= (CVE-2022-38745)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 25 Mar 2023 14:04:55 +0100
+ 
+ libreoffice (1:7.0.4-4+deb11u5) bullseye; urgency=medium
+ 
+   * debian/patches/hrk-euro-default.diff: default to EUR for .hr 
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 27 Nov 2022 19:37:58 +0100
+ 
+ libreoffice (1:7.0.4-4+deb11u4) bullseye-security; urgency=high
+ 
+   * debian/patches/ZDI-CAN-17859.diff: fix ZDI-CAN-17859/CVE-2022-3140
+ 
+  -- Rene Engelhard <rene@debian.org>  Tue, 06 Sep 2022 18:54:37 +0200
  
  libreoffice (1:7.0.4-4+deb11u3) bullseye; urgency=medium