Manual merge of version 2.11.0-1+rpi1 and 2.12.0-1 to produce 2.12.0-1+rpi1

diff --cc debian/changelog
index ce544ffb7910167d4800ead82e4f4a2f63dc961a,0cfd03d9173f52a5849a7c6fb42f8fe09fd6c9eb..2129481667b291ad6f581b103dd0cd6c136fd94f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,30 @@@
- cmus (2.11.0-1+rpi1) trixie-staging; urgency=medium
++cmus (2.12.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>  Sat, 15 Jun 2024 08:21:03 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 19 Jun 2025 09:14:47 +0000
++
+ cmus (2.12.0-1) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Philippe SWARTVAGHER ]
+   * New upstream version 2.12.0 (Closes: #1087737)
+     + Refresh patches
+   * Bump standards-version to 4.7.2: no change needed
+   * d/rules: remove as-needed linker flag
+   * Add lintian override for library-not-linked-against-libc
+     of usr/lib/cmus/op/sndio.so
+   * Add patch to use hardening flags to build Doc/ttman
+ 
+   [ Helmut Grohne ]
+   * Fix FTCBFS: Fix build/host confusion. (Closes: #954749)
+ 
+   [ Dylan Aïssi ]
+   * Convert debian/copyright to DEP5
+ 
+  -- Philippe SWARTVAGHER <phil.swart@gmx.fr>  Sat, 15 Mar 2025 22:56:48 +0100
  
  cmus (2.11.0-1) unstable; urgency=medium
  

diff --cc debian/rules
index 4ea17eb0dcd3c73a27d77391aa25100dc1b3c19b,765979d827fa86dfb4940fa0d0ce3471788f7db1..90fc9aae1902bc7a235beece6a929aceeccac647
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -11,7 -11,7 +11,7 @@@ endi
  #    ./track_info.c:47: undefined reference to `__atomic_fetch_add_8'
  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935678
  # Depends on 13-atomic_ld.patch
- ifneq (,$(findstring $(DEB_BUILD_ARCH), armhf armel m68k mipsel powerpc sh4))
 -ifneq (,$(findstring $(DEB_HOST_ARCH), armel m68k mipsel powerpc sh4))
++ifneq (,$(findstring $(DEB_HOST_ARCH), armhf armel m68k mipsel powerpc sh4))
  export LDLIBS += -latomic
  endif