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

diff --cc debian/changelog
index 7eddba2584b73ccaf4893f8e58169b279af2c00d,60dc7d10ce2aaac1bcc22fefa471467578b73d42..2ac4ce3009c0d8820d887e95cf972bff9ecf4e05
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,34 +1,47 @@@
- libreoffice (4:7.4.7-1+rpi1+deb12u2) bookworm-staging; urgency=medium
++libreoffice (4:7.4.7-1+rpi1+deb12u5) 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, 26 May 2024 13:12:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 18 Sep 2024 09:40:02 +0000
++
+ libreoffice (4:7.4.7-1+deb12u5) bookworm-security; urgency=medium
+ 
+   * debian/patches/debian/patches/do-not-trust-any-signature-on-repaired-package.diff:
+     as name says (CVE-2024-7788) 
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 22 Aug 2024 18:44:46 +0200
+ 
+ libreoffice (4:7.4.7-1+deb12u4) bookworm-security; urgency=medium
+ 
+   * remove-ability-to-trust-not-validated-macro-signatures-in-high-security.diff:
+     as name says (CVE-2024-6472)
+ 
+   * debian/rules:
+     - fix kio sed call introduced in last upload
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 01 Aug 2024 12:33:25 +0000
+ 
+ libreoffice (4:7.4.7-1+deb12u3) bookworm; urgency=medium
+ 
+   * debian/patches/Fix-backup-copy-creation-for-files-on-mounted-samba-shares.diff:
+     as name says, from 24.2.2+ (closes: #1069835)
+   * debian/patches/fix-32bit-build.diff: as name says; fix 32bit build with
+     above
+ 
+   * debian/rules:
+     - don't remove libforuilo.so in -core-nogui. (closes: #1059158)
+       It's subsumed in libmerged on 64bit archs anyway which we definitely
+       need to keep anyway (similar as libuuilo.so).
+     - recommend kio >> 5.103.0-1 in -kf5
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 24 May 2024 21:06:45 +0200
  
  libreoffice (4:7.4.7-1+deb12u2) bookworm-security; urgency=high
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge