Merge version 5.12.0-6+rpi1 and 5.12.0-7 to produce 5.12.0-7+rpi1

diff --cc debian/changelog
index a994acc68b32f53e3a9144544e635f4e8f0db0b3,88341ebeeef4c76fbb5b2156e332d2faff7c4a12..7b4d34260687e5bd778ce9e6c72bd2442d4a2ffb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- collectd (5.12.0-6+rpi1) bullseye-staging; urgency=medium
++collectd (5.12.0-7+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>  Thu, 10 Jun 2021 22:11:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Aug 2021 18:42:28 +0000
++
+ collectd (5.12.0-7) unstable; urgency=medium
+ 
+   * Team upload.
+   * Fix CGI::param error in collection3 (Closes: 982294)
+ 
+  -- Kentaro Hayashi <kenhys@xdump.org>  Wed, 14 Jul 2021 21:46:02 +0900
  
  collectd (5.12.0-6) unstable; urgency=medium