Manual merge of version 0.22.0-1+rpi1 and 0.22.0-2 to produce 0.22.0-2+rpi1

diff --cc debian/changelog
index 4c0319d43c64dd2f5b94075f65af6ed369310e0a,700bbb53f98e54040e2320bf726858824763bf67..097346d493f6518091d1eafd34cf75fd5e51cfa1
--- 1/debian/changelog
--- 2/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 <plugwash@raspbian.org> 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 <plugwash@raspbian.org>  Thu, 01 Jun 2023 19:31:35 +0000
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  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) <umlaeute@debian.org>  Wed, 11 Jan 2023 22:47:49 +0100
  
  giada (0.22.0-1) unstable; urgency=medium
  

diff --cc debian/control
index 7af02f917b6ccf3258fbafdba881f210bccaf527,be3ae9d47701b5ed793df1db9942beaeca937fea..f0b87c9ed145edffc9ef5ac074ceb6a8db4943b4
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -28,8 -29,7 +29,8 @@@ Build-Depends
   nlohmann-json3-dev,
   xauth,
   xvfb,
- Standards-Version: 4.6.1
 + fluid,
+ 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 99dfcba2706caa9290024db0a3fc792670462e92,773f3bdb13ef8b86f0781ed4824ea11167953044..2e24087ec16c2deed8c4abd90cdc022529c588fd
--- 1/debian/rules
--- 2/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 $@