Merge version 5.12.0-4+rpi1 and 5.12.0-5 to produce 5.12.0-5+rpi1

diff --cc debian/changelog
index 55606bdc847e303f01cc53aff3ff9155e9797d0c,74daf54e1272625d8b8fe3a9a38bb2de5c8537dc..ac490d6d33a11e3501833edf62542dd96869d620
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- collectd (5.12.0-4+rpi1) bullseye-staging; urgency=medium
++collectd (5.12.0-5+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 5.11.0-7+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Sep 2020 14:58:41 +0000]
 +  * Use libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 10 Jan 2021 11:01:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Feb 2021 23:04:52 +0000
++
+ collectd (5.12.0-5) unstable; urgency=medium
+ 
+   * [11ee08b] Disable tokyotyrant.
+     See #980331 for details
+ 
+  -- Bernd Zeimetz <bzed@debian.org>  Tue, 26 Jan 2021 10:52:28 +0100
  
  collectd (5.12.0-4) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge