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

diff --cc debian/changelog
index defc4b94b6ed6c6af0b0d3bd76d6acf00ff53744,79a43983312c7d909ca5c852c67ccaa3304e376d..5d60e06db610643e5fe9def7668ce8255a44120b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,18 @@@
- marble (4:24.12.3-3+rpi1) trixie-staging; urgency=medium
++marble (4:25.04.0-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 4:24.12.3-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 04 May 2025 06:29:14 +0000]
 +  * Remove armhf from qtwebengine architecture lists.
 +  * Update symbols file for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 04 May 2025 06:29:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 17 May 2025 03:37:12 +0000
++
+ marble (4:25.04.0-1) unstable; urgency=medium
+ 
+   [ Aurélien COUDERC ]
+   * New upstream release (25.04.0).
+   * Update build-deps and deps with the info from cmake.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Thu, 17 Apr 2025 22:02:43 +0200
  
  marble (4:24.12.3-3) unstable; urgency=medium
  

diff --cc debian/control
index 8335c1c2ed20f5bcdbc688228435441646b07aa2,63f76fca9eb61a37d890bad73e325909b81593b4..1278786fffaf60a6fdd859d9ce8f53a38434ece1
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -88,10 -88,10 +88,10 @@@ Multi-Arch: sam
  Section: libdevel
  Depends: libastro-dev (= ${binary:Version}),
           libmarblewidget-qt6-28 (= ${binary:Version}),
-          qt6-base-dev (>= 6.6~),
           qt6-5compat-dev (>= 6.6~),
+          qt6-base-dev (>= 6.6~),
           qt6-svg-dev (>= 6.6~),
 -         qt6-webengine-dev (>= 6.6~) [amd64 arm64 armhf i386],
 +         qt6-webengine-dev (>= 6.6~) [amd64 arm64 i386],
           ${misc:Depends},
           ${sameVersionDep:qt6-base-dev:libmarblewidget-qt6-28},
           ${shlibs:Depends},