Merge version 4:25.04.0-1+rpi1 and 4:25.04.2-1 to produce 4:25.04.2-1+rpi1

diff --cc debian/changelog
index 87b509181c4e01f9f7472d73b9eb471ef14ee2d2,26663266aa3ced93e8dffedba6e86cca34925c4a..57bb420aefda4c8d1a1da30fcca26d378d95cb1b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,17 +1,24 @@@
- okular (4:25.04.0-1+rpi1) trixie-staging; urgency=medium
++okular (4:25.04.2-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 4:25.04.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 03 Jun 2025 01:47:17 +0000]
 +  * Update symbols file for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 03 Jun 2025 01:47:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 07 Nov 2025 18:02:07 +0000
++
+ okular (4:25.04.2-1) unstable; urgency=medium
+ 
+   [ Aurélien COUDERC ]
+   * New upstream release (25.04.1).
+     - Fix build with Qt 6.10.
+     - Delete old kconf update script.
+     - Fax: Add a few bugprone-sizeof-expression exceptions.
+   * New upstream release (25.04.2).
+     - Fix detecting HTML in mobipocket document.
+     - Fix opening password protected files on builds without kwallet.
+     (kde#503852)
+   * Update the list of installed files.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Mon, 09 Jun 2025 23:18:58 +0200
  
  okular (4:25.04.0-1) unstable; urgency=medium