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

diff --cc debian/changelog
index b5a4c94c1807bb584d248408101da439cf0ed925,6b1621f7a8d7562cbb4a845d905cb184f0ad5d65..107d57a22aed8eb65aa030458c98356b179d6058
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,25 @@@
- knotes (4:21.08.1-1+rpi1) bookworm-staging; urgency=medium
++knotes (4:21.12.3-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>  Fri, 01 Oct 2021 16:31:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Apr 2022 16:53:04 +0000
++
+ knotes (4:21.12.3-2) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Upload to unstable.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Fri, 01 Apr 2022 22:10:38 +0200
+ 
+ knotes (4:21.12.3-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (21.12.3).
+   * Update build-deps and deps with the info from cmake.
+   * Add myself to Uploaders.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Thu, 24 Mar 2022 23:28:29 +0100
  
  knotes (4:21.08.1-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge