Merge version 2.10.0-3+rpi1 and 2.10.0-4 to produce 2.10.0-4+rpi1

diff --cc debian/changelog
index b09448d0b4879d5017c2383a224c1865005c03f5,d80fceea8a96a2dbf9424541adb1052b91fa1578..57a198c221d8dd0f319676613b323aaa0ac47a15
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- cmus (2.10.0-3+rpi1) bookworm-staging; urgency=medium
++cmus (2.10.0-4+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2.8.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 19 Aug 2020 09:42:31 +0000]
 +  * Add armhf to list of libatomic architectures.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 15 Feb 2023 05:57:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 22 Sep 2023 04:19:00 +0000
++
+ cmus (2.10.0-4) unstable; urgency=medium
+ 
+   * Team upload
+   * debian/patches: Apply upstream patch to fix compatibility with ffmpeg 6.0
+     (Closes: #1041375)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Thu, 27 Jul 2023 21:00:31 +0200
  
  cmus (2.10.0-3) unstable; urgency=medium