From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 26 Jan 2023 03:54:34 +0000 (+0000)
Subject: Merge version 2.6.7-1+rpi1 and 2.6.8-1 to produce 2.6.8-1+rpi1
X-Git-Tag: archive/raspbian/2.6.8-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6bdfa223b319726ac8d15a9c8a767af2edddd0aa;p=haproxy.git

Merge version 2.6.7-1+rpi1 and 2.6.8-1 to produce 2.6.8-1+rpi1
---

6bdfa223b319726ac8d15a9c8a767af2edddd0aa
diff --cc debian/changelog
index 7733350,87602d9..a3b1e6c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- haproxy (2.6.7-1+rpi1) bookworm-staging; urgency=medium
++haproxy (2.6.8-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, 09 Dec 2022 03:33:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Jan 2023 03:54:33 +0000
++
+ haproxy (2.6.8-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Tue, 24 Jan 2023 11:57:14 +0100
  
  haproxy (2.6.7-1) unstable; urgency=medium