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

diff --cc debian/changelog
index 8cb09c7a584581e6e7d47ff78f7877474d4036b8,d25204a18b307c2040f2988a2df61c54579d6041..708c8e96a0e7f502202d80acce502d8223a2d8d1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,11 +1,18 @@@
- cantor (4:24.12.3-1+rpi1) trixie-staging; urgency=medium
++cantor (4:25.04.0-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 4:24.12.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 02 May 2025 03:08:57 +0000]
 +  * Remove armhf from qtwebengine architecture lists.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 02 May 2025 03:08:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 21 Jun 2025 13:29:53 +0000
++
+ cantor (4:25.04.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Mark libcantorlibs28abi2 as Multi-Arch: same, and libcantorlibs-data as
+     Multi-Arch: foreign.
+   * Update debian/copyright.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 27 Apr 2025 09:18:42 +0200
  
  cantor (4:24.12.3-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge