Merge version 4:21.12.3-2+rpi1 and 4:22.04.2-2 to produce 4:22.04.2-2+rpi1

diff --cc debian/changelog
index 107d57a22aed8eb65aa030458c98356b179d6058,049a3c962cc7681346d57225a2230876d4860499..dc4518649c4f163202079e8488ecaffba43ea2a6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,32 @@@
- knotes (4:21.12.3-2+rpi1) bookworm-staging; urgency=medium
++knotes (4:22.04.2-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 4:17.08.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jan 2018 08:32:43 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Apr 2022 16:53:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 07 Jul 2022 21:08:19 +0000
++
+ knotes (4:22.04.2-2) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Upload to unstable.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Mon, 27 Jun 2022 22:02:46 +0200
+ 
+ knotes (4:22.04.2-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (22.04.2).
+   * Update build-deps and deps with the info from cmake.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Sun, 19 Jun 2022 02:47:52 +0200
+ 
+ knotes (4:22.04.1-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (22.04.1).
+   * Update build-deps and deps with the info from cmake.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Thu, 26 May 2022 16:14:02 +0200
  
  knotes (4:21.12.3-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge