From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 16 Jun 2022 13:13:37 +0000 (+0100)
Subject: Merge version 2.4.16-1+rpi1 and 2.4.17-1 to produce 2.4.17-1+rpi1
X-Git-Tag: archive/raspbian/2.4.17-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1623067beec64c6dcc14df6c1b4822d79b46e811;p=haproxy.git

Merge version 2.4.16-1+rpi1 and 2.4.17-1 to produce 2.4.17-1+rpi1
---

1623067beec64c6dcc14df6c1b4822d79b46e811
diff --cc debian/changelog
index ff60806,855ac15..25b3f60
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- haproxy (2.4.16-1+rpi1) bookworm-staging; urgency=medium
++haproxy (2.4.17-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, 06 May 2022 06:20:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Jun 2022 13:13:37 +0000
++
+ haproxy (2.4.17-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Sat, 14 May 2022 14:27:20 +0200
  
  haproxy (2.4.16-1) unstable; urgency=medium