Merge version 4:7.4.5-2+rpi1 and 4:7.4.5-3 to produce 4:7.4.5-3+rpi1

diff --cc debian/changelog
index fabd32a41beffe10dc71b68da6e47cc8e4ad162a,f146bba885cdcd55fd202fca250fa6d2e27cdc8b..ed86ad60960b9a539f0a5fc143503cb3cb738cb7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,16 +1,29 @@@
- libreoffice (4:7.4.5-2+rpi1) bookworm-staging; urgency=medium
++libreoffice (4:7.4.5-3+rpi1) bookworm-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
 +
 +  [changes introduced in 1:7.2.4-3+rpi1 by Peter Michael Green]
 +  * Use clang 11, newer versions cause armv7 contamination issues.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 12 Feb 2023 06:14:22 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 02 Jun 2023 08:00:22 +0000
++
+ libreoffice (4:7.4.5-3) unstable; urgency=high
+ 
+   * debian/patches/sc-stack-parameter-count.diff: fix CVE-2023-0950
+     ("Array Index UnderFlow in Calc Formula Parsing")
+   * debian/rules, debian/tests/*: don't fail if ulimit -c unlimited fails 
+     (like in ci.d.n infrastructure after the bookworm upgrade...)
+   * debian/patches/CVE-2023-2255.diff:
+     fix CVE-2023-2555 ("Remote documents loaded without prompt via IFrame")
+   * debian/changelog:
+     - mention CVE-2022-38745 in 1:7.3.1-1s changelog
+     - fix typo in last upload (s/choosen/chosen/), thanks lintian
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 22 May 2023 18:00:45 +0200
  
  libreoffice (4:7.4.5-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge