From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 7 Aug 2021 18:42:28 +0000 (+0100)
Subject: Merge version 5.12.0-6+rpi1 and 5.12.0-7 to produce 5.12.0-7+rpi1
X-Git-Tag: raspbian/5.12.0-7+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fb8a1c3d7bb74bb4ae110a869de7181be54c2201;p=collectd.git

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

4d36f2ecbd26048743251a3aedb15a520b6334df
diff --cc debian/changelog
index a994acc,88341eb..7b4d342
--- a/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