Merge version 24.12.0-2+rpi1 and 24.12.1-2 to produce 24.12.1-2+rpi1

diff --cc debian/changelog
index 6eb0ce6369aa38d47adb8ad7740a34274a0bf21a,97011a028aa2e07eeadcd02359cdd14762463fb6..fd3667960db7a18bf240db615cbaf371565ba06b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,16 +1,23 @@@
- k3b (24.12.0-2+rpi1) trixie-staging; urgency=medium
++k3b (24.12.1-2+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 31 Dec 2024 11:14:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Feb 2025 18:24:06 +0000
++
+ k3b (24.12.1-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/control: Use taglib 2.x build-dependency package name:
+     libtag1-dev => libtag-dev.
+ 
+  -- Boyuan Yang <byang@debian.org>  Wed, 05 Feb 2025 19:14:44 -0500
+ 
+ k3b (24.12.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Salvo 'LtWorf' Tomaselli <ltworf@debian.org>  Fri, 17 Jan 2025 10:16:54 +0100
  
  k3b (24.12.0-2) unstable; urgency=medium
  

diff --cc debian/control
index a99aefc7373e053661ca8f7127973235070883ef,d9270809af299bede2452412c0eb3dbfa06521c5..ddd13826dbb6146d5c98ef4110c64a2d3f2c03e3
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -37,10 -37,10 +37,10 @@@ Build-Depends: debhelper-compat (= 13)
                 libmpcdec-dev,
                 libsamplerate0-dev,
                 libsndfile1-dev,
-                libtag1-dev,
+                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