diff -Nru giada-0.15.4+ds1/debian/changelog giada-0.15.4+ds1/debian/changelog
--- giada-0.15.4+ds1/debian/changelog	2019-08-20 13:32:54.000000000 +0000
+++ giada-0.15.4+ds1/debian/changelog	2019-09-07 02:28:38.000000000 +0000
@@ -1,3 +1,10 @@
+giada (0.15.4+ds1-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 0.15.2+ds1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 17 Mar 2019 13:18:55 +0000]
+  * Link against libatomic on armhf too for raspbian.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Sep 2019 02:28:38 +0000
+
 giada (0.15.4+ds1-1) unstable; urgency=medium
 
   * New upstream version 0.15.4+ds1
diff -Nru giada-0.15.4+ds1/debian/rules giada-0.15.4+ds1/debian/rules
--- giada-0.15.4+ds1/debian/rules	2019-08-20 13:32:54.000000000 +0000
+++ giada-0.15.4+ds1/debian/rules	2019-09-07 02:28:38.000000000 +0000
@@ -23,7 +23,7 @@
 # - https://gcc.gnu.org/wiki/Atomic
 # - https://gcc.gnu.org/wiki/Atomic/GCCMM/LIbrary
 # - the 'clasp' packaging
-noatomicarch = $(shell dpkg-architecture -qDEB_HOST_ARCH | egrep -x "(armel|powerpc|powerpcspe|m68k|mips|mipsel|sh4|riscv64)")
+noatomicarch = $(shell dpkg-architecture -qDEB_HOST_ARCH | egrep -x "(armel|armhf|powerpc|powerpcspe|m68k|mips|mipsel|sh4|riscv64)")
 # link with libatomic on architectures without built-in atomic
 ifeq ($(if $(noatomicarch),atomic), atomic)
 	LIBS += -latomic