From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 11 Jan 2022 04:23:03 +0000 (+0000)
Subject: Merge version 1:7.2.4-2+rpi1 and 1:7.2.4-3 to produce 1:7.2.4-3+rpi1
X-Git-Tag: raspbian/1%7.2.4-3+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7f15232befd0f36177ac441a7c47c150860a0a37;p=libreoffice.git

Merge version 1:7.2.4-2+rpi1 and 1:7.2.4-3 to produce 1:7.2.4-3+rpi1
---

743b90be7b320cc7ff897e18724da44e82e212c1
diff --cc debian/changelog
index 405abf8d0b9,e5e9f436170..d28ac3a4743
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,19 @@@
- libreoffice (1:7.2.4-2+rpi1) bookworm-staging; urgency=medium
++libreoffice (1:7.2.4-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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 24 Dec 2021 23:55:24 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Jan 2022 04:23:01 +0000
++
+ libreoffice (1:7.2.4-3) unstable; urgency=medium
+ 
+   * debian/patches/fix-Tdf126116-test.diff: add patch from gerrit;
+     fix upstream FTBFS timebomb
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 23 Dec 2021 17:18:03 +0100
  
  libreoffice (1:7.2.4-2) unstable; urgency=medium