Merge version 1.9.6-1+rpi1 and 1.10.0-1 to produce 1.10.0-1+rpi1

diff --cc debian/changelog
index f27c9b53887fe03321e8a11446d2b1d77a7a1219,20d28bca1d2da2f241f24aa38f0f242df88af6ae..368f5ce2726b061dac0b075f1cf5fa0ca508780c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,15 +1,22 @@@
- kdiff3 (1.9.6-1+rpi1) bookworm-staging; urgency=medium
++kdiff3 (1.10.0-1+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 1.9.6-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 07 Jul 2022 23:26:09 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 07 Jul 2022 23:26:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Feb 2023 20:01:52 +0000
++
+ kdiff3 (1.10.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update standards version to 4.6.2, no changes needed.
+   * Update the build dependencies according to the upstream build system:
+     - bump cmake to 3.14
+     - bump Qt packages to 5.15.2
+     - bump KF packages to 5.50.0
+     - bump libboost-dev to 1.71.0
+   * Update install files.
+ 
+  -- Pino Toscano <pino@debian.org>  Tue, 10 Jan 2023 22:32:12 +0100
  
  kdiff3 (1.9.6-1) unstable; urgency=medium