From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 5 Feb 2021 23:04:52 +0000 (+0000)
Subject: Merge version 5.12.0-4+rpi1 and 5.12.0-5 to produce 5.12.0-5+rpi1
X-Git-Tag: archive/raspbian/5.12.0-5+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6f1901a35a4790a29e9abedeba1fda394320f0d1;p=collectd.git

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

6f1901a35a4790a29e9abedeba1fda394320f0d1
diff --cc debian/changelog
index 55606bd,74daf54..ac490d6
--- a/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