From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 10 Jan 2021 09:59:21 +0000 (+0000)
Subject: Merge version 2.2.6-1+rpi1 and 2.2.6-2 to produce 2.2.6-2+rpi1
X-Git-Tag: archive/raspbian/2.2.6-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=77f19de9caf5aa8381859b715362939eeca53463;p=haproxy.git

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

77f19de9caf5aa8381859b715362939eeca53463
diff --cc debian/changelog
index 936b25a,3be3a01..ed67675
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- haproxy (2.2.6-1+rpi1) bullseye-staging; urgency=medium
++haproxy (2.2.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>  Thu, 10 Dec 2020 13:40:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 10 Jan 2021 09:59:21 +0000
++
+ haproxy (2.2.6-2) unstable; urgency=medium
+ 
+   * d/tests: sleep before test to let Apache2 start.
+     Closes: #976997.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Thu, 07 Jan 2021 07:56:14 +0100
  
  haproxy (2.2.6-1) unstable; urgency=medium