From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 18 Nov 2021 19:35:48 +0000 (+0000)
Subject: Merge version 2.4.8-1+rpi1 and 2.4.8-2 to produce 2.4.8-2+rpi1
X-Git-Tag: archive/raspbian/2.4.8-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e37d4e0594673b57ca775a3ef6de0540f617d0b6;p=haproxy.git

Merge version 2.4.8-1+rpi1 and 2.4.8-2 to produce 2.4.8-2+rpi1
---

e37d4e0594673b57ca775a3ef6de0540f617d0b6
diff --cc debian/changelog
index 215f217,f12a021..1818a50
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- haproxy (2.4.8-1+rpi1) bookworm-staging; urgency=medium
++haproxy (2.4.8-2+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>  Thu, 11 Nov 2021 19:16:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Nov 2021 19:35:48 +0000
++
+ haproxy (2.4.8-2) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Enable OpenTracing support.
+ 
+  -- Stephen Gelman <ssgelm@debian.org>  Tue, 09 Nov 2021 23:06:46 -0600
  
  haproxy (2.4.8-1) unstable; urgency=medium