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

diff --cc debian/changelog
index f1c906cd96c497426d34d73677228e2bb58c5cab,0b8939c38ac1b2062761adae51ed9e45dd68aa66..1ba5d849d7d012cab4741c6e8908e6842baa160f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,55 +1,72 @@@
- libreoffice (4:24.2.5-4+rpi1) trixie-staging; urgency=medium
++libreoffice (4:24.8.2-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>  Sun, 08 Sep 2024 14:58:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Oct 2024 05:07:15 +0000
 +
- libreoffice (4:24.2.5-4) unstable; urgency=medium
+ libreoffice (4:24.8.2-1) unstable; urgency=medium
+ 
+   * LibreOffice 24.8.2 final (indentical to rc1...) 
+ 
+   * upload to unstable
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 27 Sep 2024 17:38:49 +0200
+ 
+ libreoffice (4:24.8.2~rc1-1) experimental; urgency=medium
+ 
+   * New upstream snapshot 
+ 
+   * debian/rules: add some explanatory comments for AUTOPKGTEST_BUILD
+   * debian/tests/control.in:
+     - make testtools-bridgetest-without-java Architecture: %OOO_NOJAVA_ARCHS%
+       only run on archs where Java is disabled (also because on amd64 it fails
+       with a full with-Java build tree, like with build-needed tests)
+     - enable most of the build-needed tests: fake-build-tests,
+       cppunit-subsequentcheck, slowcheck, unitcheck (amd64 only)
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 23 Sep 2024 18:53:14 +0200
+ 
+ libreoffice (4:24.8.1-2) unstable; urgency=medium
+ 
+   * upload to unstable
+ 
+   * debian/rules: don't use <!nocheck> on libcppunit-dev build-dep
+     for now since it's (per default) assumed to be there by configure
+     used in build-indep and that fails with -Pnocheck 
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 22 Sep 2024 23:40:32 +0200
+ 
+ libreoffice (4:24.8.1-1) experimental; urgency=medium
+ 
+   * New upstream release
+ 
+   * debian/rules: split check target into build-tests and check.
+     Set BUILD_ONLY_EN_US=y for the build inside autopkgtest
+   * debian/control.in, debian/fake-build-tests: handle new autopkgtest
+     which does a nocheck build by running build-tests before attempting to
+     run the tests. Subject to timeout at 150m/160m. Change mkdir -ps to
+     touch since that also works
+   * debian/tests/{cppunit-subsequent,slow,unit}check: skip if
+     fake-build-tests get timeout (aka skipped)
+   * debian/rules, debian/control.{mysql,}.in: ensure the mysql test is
+     always last
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 18 Sep 2024 18:14:37 +0200
+ 
+ libreoffice (4:24.8.1~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
  
    * debian/patches/jdk-minimal-and-zero-paths.diff: add new
      minimal/zero JDK paths as of OpenJDK 21, thanks

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge