diff -Nru opencv-4.6.0+dfsg/debian/changelog opencv-4.6.0+dfsg/debian/changelog --- opencv-4.6.0+dfsg/debian/changelog 2022-09-22 00:51:42.000000000 +0000 +++ opencv-4.6.0+dfsg/debian/changelog 2022-09-24 16:18:41.000000000 +0000 @@ -1,3 +1,10 @@ +opencv (4.6.0+dfsg-7+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 4.6.0+dfsg-4+rpi1 by Peter Michael Green at Sun, 17 Jul 2022 00:23:33 +0000] + * Link with libatomic on armhf too. + + -- Raspbian forward porter Sat, 24 Sep 2022 16:18:41 +0000 + opencv (4.6.0+dfsg-7) unstable; urgency=medium [ Victor Westerhuis ] diff -Nru opencv-4.6.0+dfsg/debian/rules opencv-4.6.0+dfsg/debian/rules --- opencv-4.6.0+dfsg/debian/rules 2022-09-21 23:37:32.000000000 +0000 +++ opencv-4.6.0+dfsg/debian/rules 2022-09-24 16:18:41.000000000 +0000 @@ -54,7 +54,7 @@ CXXFLAGS+=-gsplit-dwarf endif -ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mipsel powerpc sh4)) +ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf m68k mipsel powerpc sh4)) export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed endif