diff -Nru giada-0.22.0/debian/changelog giada-0.22.0/debian/changelog --- giada-0.22.0/debian/changelog 2022-08-20 06:54:15.000000000 +0000 +++ giada-0.22.0/debian/changelog 2022-09-22 17:07:55.000000000 +0000 @@ -1,3 +1,16 @@ +giada (0.22.0-1+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 0.15.2+ds1-2+rpi1 by Peter Michael Green at Sun, 17 Mar 2019 13:18:55 +0000] + * Link against libatomic on armhf too for raspbian. + + [changes introduced in 0.20.1+ds1-1+rpi1 by Peter Michael Green] + * Use no-as-needed when linking with libatomic to workaround library ordering issue. + + [changes introduced in 0.22.0-1+rpi1 by Peter Michael Green] + * Add build-dependency on fluid. + + -- Peter Michael Green Thu, 22 Sep 2022 17:07:55 +0000 + giada (0.22.0-1) unstable; urgency=medium [ Dennis Braun ] diff -Nru giada-0.22.0/debian/control giada-0.22.0/debian/control --- giada-0.22.0/debian/control 2022-08-20 06:54:15.000000000 +0000 +++ giada-0.22.0/debian/control 2022-09-22 17:07:55.000000000 +0000 @@ -28,6 +28,7 @@ nlohmann-json3-dev, xauth, xvfb, + fluid, Standards-Version: 4.6.1 Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/multimedia-team/giada.git diff -Nru giada-0.22.0/debian/rules giada-0.22.0/debian/rules --- giada-0.22.0/debian/rules 2022-08-20 06:54:15.000000000 +0000 +++ giada-0.22.0/debian/rules 2022-09-22 17:07:55.000000000 +0000 @@ -30,10 +30,10 @@ # - 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 + LIBS += -Wl,-push-state -Wl,-no-as-needed -latomic -Wl,-pop-state endif DEB_LDFLAGS_MAINT_APPEND += $(LIBS)