Merge version 4:25.2.1-3+rpi1 and 4:25.2.2-1 to produce 4:25.2.2-1+rpi1

diff --cc debian/changelog
index bb2b106992f01991bdc4a37c44068428bc66b25e,918df6aa17ecfdc2bb7c9aba99795cfb02271aa1..5fe2640da76d9a562f03f2bf411a72b4ad2add9d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,53 +1,70 @@@
- libreoffice (4:25.2.1-3+rpi1) trixie-staging; urgency=medium
++libreoffice (4:25.2.2-1+rpi1) trixie-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.
 +
 +  [changes introduced in 4:24.2.5-1+rpi1 by Peter Michael Green]
 +  * Build with gcc rather than clang.
 +  * Disable skia.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 15 Mar 2025 02:40:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 11 Apr 2025 23:42:46 +0000
++
+ libreoffice (4:25.2.2-1) unstable; urgency=medium
+ 
+   * LibreOffice 25.2.2 final release (identical to rc2)
+ 
+   * debian/patches/revert-858c452e5e6b7acad6932df7d1cd2f0950d47f33.diff:
+     as name says, from libreoffice-25-2 branch to fix some --convert-to
+     for Word issues 
+   * debian/patches/qt-avmedia-handle-null-media-player.diff: backport
+     from libreoffice-25-2 branch to fix pptx with youtube links crashing
+ 
+   * upload to unstable
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 26 Mar 2025 17:38:59 +0100
+ 
+ libreoffice (4:25.2.2~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/disable-tdf163105-tests-due-to-old-amiri.diff: patch two
+     tests relying on newer amiri font out (see also below)
+ 
+   * debian/rules:
+     - ENABLE_CPDB=n on bookworm-backports, since libcpdb-frontend-dev
+       doesn't exist in bookworm
+     - bump fonts-hosny-amiri build-dep to (>= 1.000), except on
+       bookworm-backports where bookworm only has 0.113. Patch the two affected
+       vcl_pdfexport2 tests out for bookworm-backports
+       (disable-tdf163105-tests-due-to-old-amiri.diff)
+   * debian/po:
+     - add ar.po from Maytham Alsudany <maytham@debian.org>
+       (closes: #1100369) 
+     - add pt.po from Américo Monteiro <a_monteiro@gmx.com>
+       (closes: #1100358)
+     - add cs.po from Miroslav Kure <kurem@upcase.inf.upol.cz>
+       (closes: #1100376)
+     - add pt_BR.po from Paulo Henrique de Lima Santana <phls@debian.org>
+     - add nl.po from Frans Spiesschaert <Frans.Spiesschaert@yucom.be>
+     - merge improvements for de.po from
+       Helge Kreutzmann <debian@helgefjell.de> (closes: #1100570)
+     - add fr.po from Jean-Paul Guillonneau <guillonneau.jeanpaul@free.fr>
+       (closes: #1100609)
+     - add gl.po from Parodper <parodper@gmail.com>
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 22 Mar 2025 10:31:23 +0100
+ 
+ libreoffice (4:25.2.2~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 07 Mar 2025 22:02:58 +0100
  
  libreoffice (4:25.2.1-3) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge