diff -Nru haproxy-2.0.14/debian/changelog haproxy-2.0.14/debian/changelog --- haproxy-2.0.14/debian/changelog 2020-04-16 16:34:22.000000000 +0000 +++ haproxy-2.0.14/debian/changelog 2020-04-24 21:52:19.000000000 +0000 @@ -1,3 +1,10 @@ +haproxy (2.0.14-1+rpi1) bullseye-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 Fri, 24 Apr 2020 21:52:19 +0000 + haproxy (2.0.14-1) unstable; urgency=medium * New upstream release. diff -Nru haproxy-2.0.14/debian/rules haproxy-2.0.14/debian/rules --- haproxy-2.0.14/debian/rules 2020-04-16 16:34:22.000000000 +0000 +++ haproxy-2.0.14/debian/rules 2020-04-24 21:52:19.000000000 +0000 @@ -32,7 +32,7 @@ MAKEARGS+= USE_REGPARM=1 endif -ifneq ($(filter armel mips mipsel m68k powerpc powerpcspe sh4,$(DEB_HOST_ARCH)),) +ifneq ($(filter armel armhf mips mipsel m68k powerpc powerpcspe sh4,$(DEB_HOST_ARCH)),) MAKEARGS+= ADDLIB="-latomic -Wl,--no-as-needed -lgcc_s -Wl,--as-needed" else MAKEARGS+= ADDLIB="-Wl,--no-as-needed -lgcc_s -Wl,--as-needed"