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

diff --cc debian/changelog
index 7b4d34260687e5bd778ce9e6c72bd2442d4a2ffb,20724aff16a3f08c4d7862b7566c1cf8c695cb85..5140c2a75a64235d701b584d72522edbd9e72ddd
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,31 @@@
- collectd (5.12.0-7+rpi1) bullseye-staging; urgency=medium
++collectd (5.12.0-8+rpi1) bookworm-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>  Sat, 07 Aug 2021 18:42:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Feb 2022 02:58:25 +0000
++
+ collectd (5.12.0-8) unstable; urgency=medium
+ 
+   [ Kentaro Hayashi ]
+   * [4a69d6e] Fix CGI::param error in collection3
+     ref. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=982294
+     (Closes: #982294)
+ 
+   [ Bernd Zeimetz ]
+   * [c8207fc] Disable onewire until it is in testing again.
+   * [1379323] Drop hddtemp module.
+     hddtemp is going to be removed from the
+     archive.
+     Thanks to Aurelien Jarno (Closes: #1001954)
+   * [5d13bb9] Revert "Disable nut plugin for now."
+     This reverts commit 8846b4564bfca329542c8a2567e46e1b28448094.
+     Thanks to Michał Mirosław (Closes: #989805)
+   * [16b05e2] Update changelog to the version from unstable
+     The 5.12.0-7 upload was actually never pushed to the repository.
+   * [c6b9552] Remove patch~ file that was accidentally added some time ago.
+ 
+  -- Bernd Zeimetz <bzed@debian.org>  Thu, 20 Jan 2022 15:40:42 +0100
  
  collectd (5.12.0-7) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge