Merge version 24.12.1-2+rpi1 and 25.04.0-1 to produce 25.04.0-1+rpi1

diff --cc debian/changelog
index fd3667960db7a18bf240db615cbaf371565ba06b,797bbfa88bb22558872b7e8c39b60869b3adcbba..7010a33cf6478a58fa5b437ee110c3381a620294
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,25 @@@
- k3b (24.12.1-2+rpi1) trixie-staging; urgency=medium
++k3b (25.04.0-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 24.12.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 31 Dec 2024 11:14:36 +0000]
 +  * Remove armhf from qt6-webengine architecture lists.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Feb 2025 18:24:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 19 May 2025 08:37:36 +0000
++
+ k3b (25.04.0-1) unstable; urgency=medium
+ 
+   [ Aurélien COUDERC ]
+   * New upstream release (25.04.0).
+   * Bump Standards-Version to 4.7.2, no change required.
+   * Update project homepage.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Thu, 17 Apr 2025 22:25:18 +0200
+ 
+ k3b (24.12.3-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+ 
+  -- Boyuan Yang <byang@debian.org>  Wed, 02 Apr 2025 17:43:42 -0400
  
  k3b (24.12.1-2) unstable; urgency=medium
  

diff --cc debian/control
index ddd13826dbb6146d5c98ef4110c64a2d3f2c03e3,156c769a976533c4f75f40998ee9edf20af9619b..e703811dff288e3a1544fa6aa54e93c9f30b0a2d
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -40,10 -40,10 +40,10 @@@ Build-Depends: debhelper-compat (= 13)
                 libtag-dev,
                 libvorbis-dev,
                 qt6-base-dev (>= 6.6~),
 -               qt6-webengine-dev (>= 6.6~) [amd64 arm64 armhf i386],
 +               qt6-webengine-dev (>= 6.6~) [amd64 arm64 i386],
                 shared-mime-info,
- Standards-Version: 4.7.0
- Homepage: https://userbase.kde.org/K3b
+ Standards-Version: 4.7.2
+ Homepage: https://apps.kde.org/k3b/
  Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/k3b.git
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/k3b
  Rules-Requires-Root: no