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

diff --cc debian/changelog
index 5fe2640da76d9a562f03f2bf411a72b4ad2add9d,bcb1df066768b7ef18bfae25691f2d991f1aa995..e1079b1ea63b8772284c5726a3fa1aebb6b33f2d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,25 +1,42 @@@
- libreoffice (4:25.2.2-1+rpi1) trixie-staging; urgency=medium
++libreoffice (4:25.2.2-3+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>  Fri, 11 Apr 2025 23:42:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 06 May 2025 08:37:23 +0000
++
+ libreoffice (4:25.2.2-3) unstable; urgency=medium
+ 
+   * debian/patches/revert-67cffdf1b2872b4bcac657f7bcf63f19c261a5c6.diff: 
+     revert upstream "tdf#165228 Don't reuse previous path in save dialog" which was
+     added in 25.2.2 - and reverted in >= 24.2.3 rc2 (closes: #1101920)
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 23 Apr 2025 19:20:04 +0200
+ 
+ libreoffice (4:25.2.2-2) unstable; urgency=medium
+ 
+   * debian/patches/apparmor-updates.diff: 
+     - also allow 7 digits in profile, thanks
+       Matija Nalis <mnalis-debianbug@voyager.hr> for the patch
+       (closes: #1090814)
+     - allow /etc/paperspecs (used by paperconf) (closes: #1100930)
+   * debian/po:
+     - add ca.po (closes: #1102089)
+   * debian/rules:
+     - add Build-Conflicts: gpg-from-sq [$(OOO_CHECK_ARCHS)] <!nocheck>, since
+       xmlsecurity_signing fails with gpg being gpg-from-sq
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 14 Apr 2025 20:52:28 +0200
  
  libreoffice (4:25.2.2-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge