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

diff --cc debian/changelog
index 4bccde5ae598e0f2a799ddeec2107f200cb0c744,3a757c3a7dd99fd92658c7db5383a36ba5fb9701..fabd32a41beffe10dc71b68da6e47cc8e4ad162a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,16 +1,29 @@@
- libreoffice (4:7.4.5-1+rpi1) bookworm-staging; urgency=medium
++libreoffice (4:7.4.5-2+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>  Thu, 02 Feb 2023 04:30:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 12 Feb 2023 06:14:22 +0000
++
+ libreoffice (4:7.4.5-2) unstable; urgency=medium
+ 
+   * fontconfig-2.14.1-no-RGB-stripes-layout-for-sub-pixel-rendering.diff:
+     revert this local patch before/after the tests ...
+   * debian/control.in:
+     - ... but build-conflict against affected fontconfig-configs (with
+       <!nocheck>) instead since it now removes the offending config per default
+       (buildd chroot...) if not choosen otherwise via debconf (see #1030000)
+   * debian/rules:
+     - Do not add documentation symlinks when not building documentation,
+       thanks Vagrant Cascadian (closes: #1030270)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 05 Feb 2023 18:40:59 +0100
  
  libreoffice (4:7.4.5-1) unstable; urgency=medium
  

diff --cc debian/control
index b97bc5adf5eb38a30530293d0b4579124ad6f914,b3796684d7a961ae359c170c9b45e986100fe04d..ec021e9ae4977df00e31f3036c036bc33a9d168d
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -226,6 -230,10 +226,9 @@@ Build-Depends-Indep: ant (>= 1.7.0) [!h
                       rdfind,
                       symlinks
  Build-Conflicts: amd-libopencl1,
 -                 fonts-opensymbol <!nocheck>,
+                  fontconfig-config (= 2.14.1-1) <!nocheck>,
+                  fontconfig-config (= 2.14.1-2) <!nocheck>,
+                  fontconfig-config (= 2.14.1-3) <!nocheck>,
                   nvidia-glx-dev,
                   nvidia-glx-legacy-dev,
                   nvidia-libopencl1

diff --cc debian/rules
Simple merge