From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 9 Dec 2022 03:33:24 +0000 (+0000)
Subject: Merge version 2.6.6-2+rpi1 and 2.6.7-1 to produce 2.6.7-1+rpi1
X-Git-Tag: archive/raspbian/2.6.7-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cb9ddd6e01f377fc70eaa777a6265ed44d76fd08;p=haproxy.git

Merge version 2.6.6-2+rpi1 and 2.6.7-1 to produce 2.6.7-1+rpi1
---

cb9ddd6e01f377fc70eaa777a6265ed44d76fd08
diff --cc debian/changelog
index 3b3371c,bc0fc1b..7733350
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- haproxy (2.6.6-2+rpi1) bookworm-staging; urgency=medium
++haproxy (2.6.7-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>  Mon, 31 Oct 2022 09:28:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 09 Dec 2022 03:33:23 +0000
++
+ haproxy (2.6.7-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Fri, 02 Dec 2022 22:20:15 +0100
  
  haproxy (2.6.6-2) unstable; urgency=medium