From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 14 Jan 2022 08:42:33 +0000 (+0000)
Subject: Merge version 2.4.11-1+rpi1 and 2.4.12-1 to produce 2.4.12-1+rpi1
X-Git-Tag: archive/raspbian/2.4.12-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2a526584913d97d60d42ba7c0de548b9af4a5bc7;p=haproxy.git

Merge version 2.4.11-1+rpi1 and 2.4.12-1 to produce 2.4.12-1+rpi1
---

2a526584913d97d60d42ba7c0de548b9af4a5bc7
diff --cc debian/changelog
index 4813c58,3f79af9..0f67f32
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- haproxy (2.4.11-1+rpi1) bookworm-staging; urgency=medium
++haproxy (2.4.12-1+rpi1) bookworm-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>  Tue, 11 Jan 2022 03:08:35 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 14 Jan 2022 08:42:33 +0000
++
+ haproxy (2.4.12-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Tue, 11 Jan 2022 12:06:17 +0100
  
  haproxy (2.4.11-1) unstable; urgency=medium