Merge version 2.10.0-4+rpi1 and 2.11.0-1 to produce 2.11.0-1+rpi1

diff --cc debian/changelog
index 57a198c221d8dd0f319676613b323aaa0ac47a15,254e2590613436ecc97b007ba7190bf55d206797..ce544ffb7910167d4800ead82e4f4a2f63dc961a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- cmus (2.10.0-4+rpi1) trixie-staging; urgency=medium
++cmus (2.11.0-1+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>  Fri, 22 Sep 2023 04:19:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 15 Jun 2024 08:21:03 +0000
++
+ cmus (2.11.0-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version 2.11.0
+     - Fix build with ffmpeg 7.0 (Closes: #1072405)
+   * debian/patches: Refresh patches
+   * debian/control:
+     - Bump Standards-Version
+     - Use pkgconf
+     - Use openmpt's modplug
+     - Use libncurses-dev
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 09 Jun 2024 23:45:17 +0200
  
  cmus (2.10.0-4) unstable; urgency=medium