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

diff --cc debian/changelog
index 50c6695a8fc2d40c6ae82ef34b3a27acb594c47f,49ea326dd7559f3c287c280e86736884dcf43927..cb539704b6fb5f070e54a1f26726c5ca0f6b2378
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,28 +1,35 @@@
- kirigami2 (5.94.0-1+rpi1) bookworm-staging; urgency=medium
++kirigami2 (5.96.0-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 5.83.0-3+rpi1 by root <Peter Michael Green <plugwash@raspbian.org> at Sun, 29 Aug 2021 23:05:08 +0000]
 +  * Update symbols file for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Jun 2022 06:28:04 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 09 Aug 2022 16:36:52 +0000
++
+ kirigami2 (5.96.0-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Remove inactive Uploaders.
+   * Modernize building:
+     - add the dh-sequence-kf5 build dependency to use the kf5 addon
+       automatically
+     - drop all the manually specified addons and buildsystem for dh
+   * CI: enable again the blhc job.
+   * Remove the unused ${shlibs:Depends} substvar from kirigami2-dev.
+   * The Breeze icon theme does not seem to be required at build time anymore,
+     so:
+     - drop the breeze-icon-theme build dependency
+     - stop passing -DBREEZEICONS_DIR=/usr/share/icons/breeze to cmake
+   * Update symbols file.
+ 
+  -- Pino Toscano <pino@debian.org>  Mon, 01 Aug 2022 08:36:30 +0200
+ 
+ kirigami2 (5.96.0-1) unstable; urgency=medium
+ 
+   [ Aurélien COUDERC ]
+   * New upstream release (5.96.0).
+   * Bump Standards-Version to 4.6.1, no change required.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Sun, 31 Jul 2022 13:33:06 +0200
  
  kirigami2 (5.94.0-1) unstable; urgency=medium
  

diff --cc debian/rules
index 4d639a3b391856dd0467ff581aeb1f0c1d046e0e,a21a70afd82e0f7527ee47f4d373216657a1cf8d..594f2bbac58ff68f28983f04191a3342f56e8d57
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -3,16 -3,11 +3,16 @@@
  export DEB_BUILD_MAINT_OPTIONS = hardening=+all
  
  %:
-       dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
+       dh $@ --with pkgkde_symbolshelper
  
  override_dh_auto_configure:
-       dh_auto_configure -- -DBUILD_QCH=ON -DBREEZEICONS_DIR=/usr/share/icons/breeze
 +      sed -i 's/(arch=!armel !riscv64)/(optional=notarmelandprobabllynotraspbian)/' debian/libkf5kirigami2-5.symbols
+       dh_auto_configure -- -DBUILD_QCH=ON
  
 +override_dh_auto_clean:
 +      dh_auto_clean
 +      sed -i 's/(optional=notarmelandprobabllynotraspbian)/(arch=!armel !riscv64)/' debian/libkf5kirigami2-5.symbols
 +
  override_dh_auto_test:
        # Disable unittest at build time, they require the runtime
        # dependencies and the modules installed. Move the tests to