From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 17 Nov 2022 10:15:06 +0000 (+0000)
Subject: Merge tag '1%7.4.2-4' into bookworm-working
X-Git-Tag: archive/raspbian/1%7.4.2-4+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e7e89b046514f9026ffe451b5955f38444c49586;p=libreoffice.git

Merge tag '1%7.4.2-4' into bookworm-working
---

e7e89b046514f9026ffe451b5955f38444c49586
diff --cc debian/changelog
index 16184094382,12de2551d74..dbc85790b0e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,22 @@@
- libreoffice (1:7.4.2-3+rpi1) bookworm-staging; urgency=medium
++libreoffice (1:7.4.2-4+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>  Tue, 15 Nov 2022 08:12:36 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 17 Nov 2022 10:14:28 +0000
++
+ libreoffice (1:7.4.2-4) unstable; urgency=medium
+ 
+   * debian/rules, debian/patches/dragonbox-1.1.3.diff: fix build with
+     dragonbox 1.1.3 and update dragonbox build-dependency 
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 12 Nov 2022 09:28:58 +0100
  
  libreoffice (1:7.4.2-3) unstable; urgency=medium