diff -Nru haproxy-2.4.9/debian/changelog haproxy-2.4.9/debian/changelog --- haproxy-2.4.9/debian/changelog 2021-11-24 18:42:28.000000000 +0000 +++ haproxy-2.4.9/debian/changelog 2021-11-27 04:01:02.000000000 +0000 @@ -1,3 +1,10 @@ +haproxy (2.4.9-1+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 1.8.19-1+rpi1 by Peter Michael Green at Thu, 14 Mar 2019 20:25:01 +0000] + * Link with libatomic on armhf too. + + -- Raspbian forward porter Sat, 27 Nov 2021 04:01:02 +0000 + haproxy (2.4.9-1) unstable; urgency=medium * New upstream release. diff -Nru haproxy-2.4.9/debian/rules haproxy-2.4.9/debian/rules --- haproxy-2.4.9/debian/rules 2021-11-24 18:42:28.000000000 +0000 +++ haproxy-2.4.9/debian/rules 2021-11-27 04:01:02.000000000 +0000 @@ -31,7 +31,7 @@ MAKEARGS+= TARGET=generic endif -ifneq ($(filter armel mips mipsel m68k powerpc powerpcspe sh4 riscv64,$(DEB_HOST_ARCH)),) +ifneq ($(filter armel armhf mips mipsel m68k powerpc powerpcspe sh4 riscv64,$(DEB_HOST_ARCH)),) MAKEARGS+= ADDLIB="-latomic" endif