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

diff --cc debian/changelog
index e1079b1ea63b8772284c5726a3fa1aebb6b33f2d,fb4e247f00e59694172987dceb6fb8a20942806c..344571a35ff0daede7d24e96c3c79e586553eb79
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,40 +1,57 @@@
- libreoffice (4:25.2.2-3+rpi1) trixie-staging; urgency=medium
++libreoffice (4:25.2.3-2+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>  Tue, 06 May 2025 08:37:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 18 May 2025 11:55:06 +0000
 +
- libreoffice (4:25.2.2-3) unstable; urgency=medium
+ libreoffice (4:25.2.3-2) 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)
+   * debian/patches/avmedia-qt-use-gstreamer-frame-grabber-by-default.diff:
+     revert (for now), actually FTBFS
  
-  -- Rene Engelhard <rene@debian.org>  Wed, 23 Apr 2025 19:20:04 +0200
+  -- Rene Engelhard <rene@debian.org>  Sun, 04 May 2025 07:34:39 +0200
  
- libreoffice (4:25.2.2-2) unstable; urgency=medium
+ libreoffice (4:25.2.3-1) unstable; urgency=medium
+ 
+   * debian/patches/avmedia-qt-use-gstreamer-frame-grabber-by-default.diff:
+     more qt6 video fixes, from libreoffice-25-2 branch
+ 
+   * LibreOffice 25.2.3 final (identical to rc2)
+ 
+   * upload to unstable
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 01 May 2025 20:06:05 +0200
+ 
+ libreoffice (4:25.2.3~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+     - Reverts "tdf#165228 Don't reuse previous path in save dialog" which was
+       added in 25.2.2 (closes: #1101920)
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 24 Apr 2025 20:41:34 +0200
+ 
+ libreoffice (4:25.2.3~rc1-2) experimental; urgency=medium
+ 
+   * 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>  Sun, 13 Apr 2025 22:38:50 +0200
+ 
+ libreoffice (4:25.2.3~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
  
    * debian/patches/apparmor-updates.diff: 
      - also allow 7 digits in profile, thanks

diff --cc debian/rules
Simple merge