From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 27 Sep 2019 22:26:49 +0000 (+0100)
Subject: Merge version 2.0.6-1+rpi1 and 2.0.6-2 to produce 2.0.6-2+rpi1
X-Git-Tag: archive/raspbian/2.0.6-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=366f043136629b5c051e322407cc5434361dda74;p=haproxy.git

Merge version 2.0.6-1+rpi1 and 2.0.6-2 to produce 2.0.6-2+rpi1
---

366f043136629b5c051e322407cc5434361dda74
diff --cc debian/changelog
index af82c9a,957c25c..0ee42c0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- haproxy (2.0.6-1+rpi1) bullseye-staging; urgency=medium
++haproxy (2.0.6-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.8.19-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 14 Mar 2019 20:25:01 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 18 Sep 2019 16:36:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 27 Sep 2019 22:26:48 +0000
++
+ haproxy (2.0.6-2) unstable; urgency=medium
+ 
+   * d/patches: fix regression with checks.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Wed, 18 Sep 2019 08:02:53 +0200
  
  haproxy (2.0.6-1) unstable; urgency=medium