From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 12 Feb 2023 06:14:30 +0000 (+0000)
Subject: Merge version 4:7.4.5-1+rpi1 and 4:7.4.5-2 to produce 4:7.4.5-2+rpi1
X-Git-Tag: archive/raspbian/4%7.4.5-2+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=430d165f97c8ae9c55a651d3a0215a04a25fee90;p=libreoffice.git

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

3a6a686c6f3faaa1b807a620ca44bacb3038e31b
diff --cc debian/changelog
index 4bccde5ae59,3a757c3a7dd..fabd32a41be
--- a/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 b97bc5adf5e,b3796684d7a..ec021e9ae49
--- a/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,
+                  fontconfig-config (= 2.14.1-1) <!nocheck>,
+                  fontconfig-config (= 2.14.1-2) <!nocheck>,
+                  fontconfig-config (= 2.14.1-3) <!nocheck>,
 -                 fonts-opensymbol <!nocheck>,
                   nvidia-glx-dev,
                   nvidia-glx-legacy-dev,
                   nvidia-libopencl1