Merge version 4:24.8.2-2+rpi1 and 4:24.8.4-1 to produce 4:24.8.4-1+rpi1

diff --cc debian/changelog
index 866bea59ec4bf99cd5466e50b373d6fa61e413f2,1004d25df88dd7e87080b5e6d68ce81c18311bdb..cf9fa8dc87e5696da6412c503620e2fc9aec261c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,37 +1,54 @@@
- libreoffice (4:24.8.2-2+rpi1) trixie-staging; urgency=medium
++libreoffice (4:24.8.4-1+rpi1) trixie-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.
 +
 +  [changes introduced in 4:24.2.5-1+rpi1 by Peter Michael Green]
 +  * Build with gcc rather than clang.
 +  * Disable skia.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 26 Oct 2024 00:10:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 29 Dec 2024 21:32:20 +0000
 +
- libreoffice (4:24.8.2-2) unstable; urgency=high
+ libreoffice (4:24.8.4-1) unstable; urgency=medium
  
-   * build without any -g (not even -g1) in autopkgtest builds
+   * New upstream release
  
-  -- Rene Engelhard <rene@debian.org>  Tue, 08 Oct 2024 17:43:46 +0200
+   * debian/rules:
+     - enable tl langpack
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 18 Dec 2024 17:10:23 +0100
+ 
+ libreoffice (4:24.8.3-3) unstable; urgency=medium
+ 
+   * debian/rules:
+     - don't set BUILD_PLASMA=n on build-indep builds if
+       PLASMA_ARCHITECTURE=all
+ 
+  -- Rene Engelhard <rene@debian.org>  Tue, 26 Nov 2024 18:33:46 +0100
+ 
+ libreoffice (4:24.8.3-2) unstable; urgency=medium
+ 
+   * debian/rules:
+     - PLASMA_VERSION=6; disable -kf5, keep -qt5 enabled, though
+   * debian/rules, debian/control.plasma.in: make -plasma Arch: all
+     (except on bookworm-backports)
+ 
+  -- Rene Engelhard <rene@debian.org>  Tue, 26 Nov 2024 06:54:31 +0100
+ 
+ libreoffice (4:24.8.3-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - fixes SyntaxWarning: invalid escape sequence '\P' in officehelper.py
+       (closes: #1082775)
+     - (closes: #1064494) by reverting the 24-2 changes causing this
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 10 Nov 2024 15:24:11 +0100
  
  libreoffice (4:24.8.2-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge