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

diff --cc debian/changelog
index 405abf8d0b9072e3a49127cdf08a2193054740fd,dba4002848f5d6916da9f0497378d448064dd0f7..e09ae70b412e8bf11931a66d8b331d5a88b8684e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,15 +1,25 @@@
- libreoffice (1:7.2.4-2+rpi1) bookworm-staging; urgency=medium
++libreoffice (1:7.2.5-1+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>  Fri, 14 Jan 2022 14:40:29 +0000
++
+ libreoffice (1:7.2.5-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 05 Jan 2022 20:14:09 +0100
+ 
+ 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
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge