Merge version 23.08.3-1+rpi1 and 24.05.2-1 to produce 24.05.2-1+rpi1

diff --cc debian/changelog
index 65665ea2b6db82ef760a2742d87a9d2007836284,722cc78c9f9a313be5da479d91d5950d3df90581..7b44f174548b9fa7288314c989778c09968d63e4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,11 +1,18 @@@
- k3b (23.08.3-1+rpi1) trixie-staging; urgency=medium
++k3b (24.05.2-1+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 23.08.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 23 Jun 2024 08:09:15 +0000]
 +  * Remove armhf from architecture list for qtwebengine build dependency.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 23 Jun 2024 08:09:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 14 Sep 2024 07:18:26 +0000
++
+ k3b (24.05.2-1) unstable; urgency=medium
+ 
+   [ Aurélien COUDERC ]
+   * New upstream release (24.05.2). (Closes: #1072425)
+   * Bump Standards-Version to 4.7.0, no change required.
+   * Update the list of installed files.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Wed, 31 Jul 2024 15:07:11 +0200
  
  k3b (23.08.3-1) unstable; urgency=medium
  

diff --cc debian/control
index cde5c3f06e9547be64dfa2247e851419b7470042,4828e8d42910a3d4cf66a8269c487ace78d877d0..35224bb3fe78364806e677db400c4aa595ba4901
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -42,9 -42,9 +42,9 @@@ Build-Depends: cmake (>= 3.16~)
                 libtag1-dev,
                 libvorbis-dev,
                 qtbase5-dev (>= 5.15.2~),
 -               qtwebengine5-dev (>= 5.15.2~) [amd64 arm64 armhf i386 mips64el],
 +               qtwebengine5-dev (>= 5.15.2~) [amd64 arm64 i386 mips64el],
                 shared-mime-info,
- Standards-Version: 4.6.2
+ Standards-Version: 4.7.0
  Homepage: https://userbase.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