From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 18 Mar 2022 02:00:11 +0000 (+0000)
Subject: Merge version 2.4.14-1+rpi1 and 2.4.15-1 to produce 2.4.15-1+rpi1
X-Git-Tag: archive/raspbian/2.4.15-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4023645939f818c1fc9f93f2e9d62b970c2984bc;p=haproxy.git

Merge version 2.4.14-1+rpi1 and 2.4.15-1 to produce 2.4.15-1+rpi1
---

4023645939f818c1fc9f93f2e9d62b970c2984bc
diff --cc debian/changelog
index 8d33676,11d8b4a..0bb1b96
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- haproxy (2.4.14-1+rpi1) bookworm-staging; urgency=medium
++haproxy (2.4.15-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>  Fri, 04 Mar 2022 13:58:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Mar 2022 02:00:11 +0000
++
+ haproxy (2.4.15-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Mon, 14 Mar 2022 20:17:04 +0100
  
  haproxy (2.4.14-1) unstable; urgency=medium