From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 14 May 2023 19:45:33 +0000 (+0100)
Subject: Merge version 2.6.9-1+rpi1 and 2.6.12-1 to produce 2.6.12-1+rpi1
X-Git-Tag: archive/raspbian/2.6.12-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=12d651f80de8e9bba73fa0f2de2c0e0dcb85e018;p=haproxy.git

Merge version 2.6.9-1+rpi1 and 2.6.12-1 to produce 2.6.12-1+rpi1
---

12d651f80de8e9bba73fa0f2de2c0e0dcb85e018
diff --cc debian/changelog
index 9466a42,150eab1..8d4c5ea
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,27 @@@
- haproxy (2.6.9-1+rpi1) bookworm-staging; urgency=medium
++haproxy (2.6.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>  Sat, 25 Feb 2023 18:01:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 14 May 2023 19:45:32 +0000
++
+ haproxy (2.6.12-1) unstable; urgency=medium
+ 
+   * New upstream version.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Sat, 01 Apr 2023 11:05:57 +0200
+ 
+ haproxy (2.6.11-1) unstable; urgency=medium
+ 
+   * New upstream version.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Sat, 18 Mar 2023 14:37:13 +0100
+ 
+ haproxy (2.6.10-1) unstable; urgency=medium
+ 
+   * New upstream version.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Sat, 11 Mar 2023 12:59:22 +0100
  
  haproxy (2.6.9-1) unstable; urgency=medium