Merge version 1:7.2.2-1+rpi1 and 1:7.2.4-1 to produce 1:7.2.4-1+rpi1

diff --cc debian/changelog
index 662dc60bf1687cb22a2217d7a566dc9f83543462,b7f06ea17eff887a0caeed2755f8b162df796bd0..4455901fd3d2a98e5e8f46826eeaa9ac307fe666
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,32 +1,42 @@@
- libreoffice (1:7.2.2-1+rpi1) bookworm-staging; urgency=medium
++libreoffice (1:7.2.4-1+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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 21 Oct 2021 16:39:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 14 Dec 2021 16:04:26 +0000
++
+ libreoffice (1:7.2.4-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+   * debian/patches/mdds-2.0-and-orcus-0.17.diff, debian/rules,
+     debian/shlibs.override.orcus:
+     build against mdds 2.0 and liborcus 0.17
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 08 Dec 2021 19:45:20 +0100
+ 
+ libreoffice (1:7.2.3-2) unstable; urgency=medium
+ 
+   * debian/changelog: fix (closes: #1000605)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 28 Nov 2021 15:05:29 +0000
+ 
+ libreoffice (1:7.2.3-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+   * debian/patches/icu-70.diff: backport from master; fix build/test
+     with icu 70 ("TestBreakIterator::testLao() had to be disabled/adapted.")
+ 
+   * debian/rules:
+     - actually only set TEST_TIMEOUT if we ignore the test results anyway...
+   * debian/control*.in: also apply 1:7.2.1-2/-3 changes for
+     libreoffice-core-nogui...
+ 
+  -- Rene Engelhard <rene@debian.org>  Tue, 23 Nov 2021 18:52:54 +0100
  
  libreoffice (1:7.2.2-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge