Merge version 24.12.0-1+rpi1 and 25.04.0-1 to produce 25.04.0-1+rpi1

diff --cc debian/changelog
index 3bcaad6f9c4a894e24df7f09e0f4cc73ef2001e2,6732e3f5beca74cde819a568b7893fffa9a90785..3cae4fdffeb8261e92a7cb72d0bb495764b924bf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,27 +1,35 @@@
- ktorrent (24.12.0-1+rpi1) trixie-staging; urgency=medium
++ktorrent (25.04.0-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 24.08.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 21 Dec 2024 02:13:05 +0000]
 +  * Remove armhf from qt6-webengine-dev architecture list.
 +  * Don't fail bulid due to missing docs.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 12 Jan 2025 21:21:34 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Aug 2025 20:33:10 +0000
++
+ ktorrent (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.
+   * Bump Standards-Version to 4.7.2, no change required.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Thu, 17 Apr 2025 22:28:45 +0200
+ 
+ ktorrent (24.12.3-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Team upload
+ 
+  -- Salvo 'LtWorf' Tomaselli <ltworf@debian.org>  Fri, 21 Mar 2025 17:39:46 +0100
+ 
+ ktorrent (24.12.0-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Rebuild against taglib 2.0.2.
+   * debian/control: Update build-dependency package name:
+     + libtag1-dev => libtag-dev.
+ 
+  -- Boyuan Yang <byang@debian.org>  Fri, 10 Jan 2025 21:46:23 -0500
  
  ktorrent (24.12.0-1) unstable; urgency=medium
  

diff --cc debian/control
index a75b030256311973126b1455de47d39c4f07f55d,76d14a630f08e3d655747fbfc3952c77bc83aa44..127cfc9fdf22b903bb0e0aa9d494af1138dc5a29
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -39,14 -39,14 +39,14 @@@ Build-Depends: debhelper-compat (= 13)
                 libmaxminddb-dev,
                 libphonon4qt6-dev,
                 libphonon4qt6experimental-dev,
-                libtag1-dev,
+                libtag-dev,
                 pkgconf,
-                qt6-5compat-dev (>= 6.5.0~),
-                qt6-base-dev (>= 6.5.0~),
-                qt6-webengine-dev (>= 6.5.0~) [amd64 arm64 i386],
+                qt6-5compat-dev (>= 6.7.0~),
+                qt6-base-dev (>= 6.7.0~),
 -               qt6-webengine-dev (>= 6.7.0~) [amd64 arm64 armhf i386],
++               qt6-webengine-dev (>= 6.7.0~) [amd64 arm64 i386],
                 xauth <!nocheck>,
                 xvfb <!nocheck>,
- Standards-Version: 4.7.0
+ Standards-Version: 4.7.2
  Rules-Requires-Root: no
  Homepage: https://apps.kde.org/ktorrent
  Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/ktorrent.git