From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 12 Sep 2022 00:42:07 +0000 (+0100)
Subject: Merge version 1:7.0.4-4+rpi1+deb11u1 and 1:7.0.4-4+deb11u3 to produce 1:7.0.4-4+rpi1... 
X-Git-Tag: raspbian/1%7.0.4-4+rpi1+deb11u3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dfeda8b7b28011a1838de1e07f1518694c16d9c7;p=libreoffice.git

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

f6f8e0a729660335d89bee07db0dda8111a83136
diff --cc debian/changelog
index 83e35ca8958,68afa56de68..965e46a80bc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,23 +1,33 @@@
- libreoffice (1:7.0.4-4+rpi1+deb11u1) bullseye-staging; urgency=medium
++libreoffice (1:7.0.4-4+rpi1+deb11u3) 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>  Thu, 21 Oct 2021 04:23:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 12 Sep 2022 00:42:04 +0000
++
+ libreoffice (1:7.0.4-4+deb11u3) bullseye; urgency=medium
+ 
+   * debian/patches/fix-e_book_client_connect_direct_sync-sig.diff:
+     as name says (closes: #1016420)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 28 Aug 2022 19:22:27 +0200
+ 
+ libreoffice (1:7.0.4-4+deb11u2) stable; urgency=medium
+ 
+   * debian/patches/hrk-euro.diff: add EUR to .hr i18n;
+     add HRK<->EUR conversion rate to Calc and the Euro Wizard
+   * debian/patches/b0404f80577de9ff69e58390c6f6ef949fdb0139.patch: fix
+     CVE-2021-25636
+   * debian/patches/0001-CVE-2022-26305-compare-authors-using-Thumbprint.patch,
+     debian/patches/0002-CVE-2022-26307-make-hash-encoding-match-decoding.patch
+     debian/patches/0003-CVE-2022-26306-add-Initialization-Vectors-to-passwor.patch
+     debian/patches/0004-CVE-2022-2630-6-7-add-infobar-to-prompt-to-refresh-t.patch:
+     fix CVE-2022-2630{5,6,7}
+ 
+  -- Rene Engelhard <rene@debian.org>  Tue, 26 Jul 2022 13:19:49 +0200
  
  libreoffice (1:7.0.4-4+deb11u1) bullseye-security; urgency=high