Merge version 4:7.4.7-1+rpi1+deb12u5 and 4:7.4.7-1+deb12u6 to produce 4:7.4.7-1+rpi1...

diff --cc debian/changelog
index 2ac4ce3009c0d8820d887e95cf972bff9ecf4e05,c5e1bcb9293f3fea7c8797c21beeb58c06d24a75..1064de2a16411e96c3c9f264534e998623e8e7b6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,12 +1,25 @@@
- libreoffice (4:7.4.7-1+rpi1+deb12u5) bookworm-staging; urgency=medium
++libreoffice (4:7.4.7-1+rpi1+deb12u6) 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>  Wed, 18 Sep 2024 09:40:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Jan 2025 19:16:11 +0000
++
+ libreoffice (4:7.4.7-1+deb12u6) bookworm-security; urgency=medium
+ 
+   * debian/patches/be-coservative-about-allowed-font-names.diff: as name says
+     (CVE-2024-12425)
+   * debian/patches/consider-VndSunStarExpand-an-exotic-protocol.diff
+     debian/patches/look-at-embedded-protocols-too.diff: add patches for
+     CVE-2024-12426 from upstream "co-22-05" branch
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 18 Jan 2025 13:30:17 +0100
  
  libreoffice (4:7.4.7-1+deb12u5) bookworm-security; urgency=medium