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

diff --cc debian/changelog
index ac490d6d33a11e3501833edf62542dd96869d620,c6a605763a7cc0c0ed9092fab84e5f2ba28f7722..a994acc68b32f53e3a9144544e635f4e8f0db0b3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- collectd (5.12.0-5+rpi1) bullseye-staging; urgency=medium
++collectd (5.12.0-6+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>  Fri, 05 Feb 2021 23:04:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Jun 2021 22:11:58 +0000
++
+ collectd (5.12.0-6) unstable; urgency=medium
+ 
+   * [b4e7861] collectd-dev: Add missing header files again.
+     Thanks to Benjamin Drung (Closes: #968950)
+   * [3261aa1] Also create necessary directories
+   * [6c0c6be] Fix target location in dh_install
+ 
+  -- Bernd Zeimetz <bzed@debian.org>  Tue, 01 Jun 2021 17:56:33 +0200
  
  collectd (5.12.0-5) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge