From: Peter Michael Green Date: Thu, 1 Jun 2023 19:32:20 +0000 (+0000) Subject: Manual merge of version 0.22.0-1+rpi1 and 0.22.0-2 to produce 0.22.0-2+rpi1 X-Git-Tag: archive/raspbian/0.22.0-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bb794ec64276755c66f4678d97ad17fe2aea5e74;p=giada.git Manual merge of version 0.22.0-1+rpi1 and 0.22.0-2 to produce 0.22.0-2+rpi1 --- bb794ec64276755c66f4678d97ad17fe2aea5e74 diff --cc debian/changelog index 4c0319d,700bbb5..097346d --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,11 +1,22 @@@ - giada (0.22.0-1+rpi1) bookworm-staging; urgency=medium ++giada (0.22.0-2+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. ++ * 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, 01 Jun 2023 19:31:35 +0000 + - -- Peter Michael Green Thu, 22 Sep 2022 17:07:55 +0000 + giada (0.22.0-2) unstable; urgency=medium + + * B-D on 'fluid' + * Link against libz + * Simplify pkg-config handling + * Bump standards version to 4.6.2 + + -- IOhannes m zmölnig (Debian/GNU) Wed, 11 Jan 2023 22:47:49 +0100 giada (0.22.0-1) unstable; urgency=medium diff --cc debian/control index 7af02f9,be3ae9d..f0b87c9 --- a/debian/control +++ b/debian/control @@@ -28,8 -29,7 +29,8 @@@ Build-Depends nlohmann-json3-dev, xauth, xvfb, + fluid, - Standards-Version: 4.6.1 + Standards-Version: 4.6.2 Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/multimedia-team/giada.git Vcs-Browser: https://salsa.debian.org/multimedia-team/giada diff --cc debian/rules index 99dfcba,773f3bd..2e24087 --- a/debian/rules +++ b/debian/rules @@@ -30,14 -31,12 +31,12 @@@ DEB_LDFLAGS_MAINT_APPEND += $(shell pk # - 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 += -Wl,-push-state -Wl,-no-as-needed -latomic -Wl,-pop-state - DEB_LDFLAGS_MAINT_APPEND += -latomic ++ DEB_LDFLAGS_MAINT_APPEND += -Wl,-push-state -Wl,-no-as-needed -latomic -Wl,-pop-state endif - DEB_LDFLAGS_MAINT_APPEND += $(LIBS) - %: dh $@