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

diff --cc debian/changelog
index 708c8e96a0e7f502202d80acce502d8223a2d8d1,21f53f854444bee163f6a093405ea56c5adec9f0..a9524f25a484f83f52cd34ea43de2b8fbb378d8e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,30 +1,37 @@@
- cantor (4:25.04.0-1+rpi1) trixie-staging; urgency=medium
++cantor (4:25.04.2-3+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 21 Jun 2025 13:29:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Jul 2025 19:33:48 +0000
++
+ cantor (4:25.04.2-3) unstable; urgency=medium
+ 
+   [ Aurélien COUDERC ]
+   * Demote sagemath again, to Suggests, according to policy §2.2.1
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Wed, 18 Jun 2025 23:42:16 +0200
+ 
+ cantor (4:25.04.2-2) unstable; urgency=medium
+ 
+   [ Aurélien COUDERC ]
+   * Demote sagemath to Recommends since it’s not available in trixie.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Wed, 18 Jun 2025 09:11:13 +0200
+ 
+ cantor (4:25.04.2-1) unstable; urgency=medium
+ 
+   [ Aurélien COUDERC ]
+   * New upstream release (25.04.1).
+     - Add missing include to fix LaTeX typesetting. (kde#490644)
+   * New upstream release (25.04.2).
+     - Translation fixes.
+   * Add missing build dependency on cups for printing support.
+   * Switch texlive recommended dependency to texlive-plain-generic, it
+     contains ulem.sty required for the rendering in Cantor.
+   * Make backends depend on the binaries they need to work.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Fri, 06 Jun 2025 15:35:25 +0200
  
  cantor (4:25.04.0-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge