Merge version 1:7.3.5~rc2-1+rpi1 and 1:7.4.0~rc2-3 to produce 1:7.4.0~rc2-3+rpi1

diff --cc debian/changelog
index 4b1630b53d178661016de90798a19fc78acd8c1f,0a0bb9d68e602437fbe705d5529584077e2444e7..36992eabc0420c70a2cd444b846dfd91da7d9356
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,23 +1,36 @@@
- libreoffice (1:7.3.5~rc2-1+rpi1) bookworm-staging; urgency=medium
++libreoffice (1:7.4.0~rc2-3+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
 +
 +  [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, 24 Jul 2022 10:30:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Aug 2022 13:14:08 +0000
 +
- libreoffice (1:7.3.5~rc2-1) unstable; urgency=medium
+ libreoffice (1:7.4.0~rc2-3) unstable; urgency=medium
  
-   * New upstream release candidate 
+   * debian/changelog: oops, fix merge... 
  
-  -- Rene Engelhard <rene@debian.org>  Sat, 16 Jul 2022 12:57:00 +0200
+  -- Rene Engelhard <rene@debian.org>  Thu, 28 Jul 2022 22:58:57 +0200
  
- libreoffice (1:7.3.5~rc1-1) unstable; urgency=medium
+ libreoffice (1:7.4.0~rc2-2) unstable; urgency=medium
  
-   * New upstream release candidate
+   * upload to unstable 
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 28 Jul 2022 08:52:48 +0200
  
-  -- Rene Engelhard <rene@debian.org>  Fri, 01 Jul 2022 21:51:28 +0200
+ libreoffice (1:7.4.0~rc2-1) experimental; urgency=medium
  
- libreoffice (1:7.3.4~rc2-1) unstable; urgency=medium
+   * debian/patches/svm-test-bigendian.diff: from master, fix svm test on
+     bigendian (other tests still fail)
+   * debian/patches/hrk-euro.diff: add HRK->EUR to the (hidden) Euro Conversion
+     Wizard for completeness' sake
+   * debian/patches/fix-uicheck-tests-on-i386.patch: readd lost/still needed
+     patch to work around rounding errors in descriptiveStatistics test on i386
  
    * New upstream release candidate
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge