Merge version 22.12.3-1+rpi1 and 24.12.0-2 to produce 24.12.0-2+rpi1

diff --cc debian/changelog
index eca2b2b29011df1046b26072aa106306e6716160,771a4148208a32f1771705d93be28ca7b1f281fb..54872aa572bcbac29b0248ff7c4bcfebd04abb6e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,49 +1,56 @@@
- kldap (22.12.3-1+rpi1) bookworm-staging; urgency=medium
++kldap (24.12.0-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 21.12.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 12 Apr 2022 21:30:09 +0000]
 +  * Disable dh_dwz.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Mar 2023 21:17:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Jan 2025 15:27:41 +0000
++
+ kldap (24.12.0-2) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Upload to unstable.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Wed, 18 Dec 2024 22:53:29 +0100
+ 
+ kldap (24.12.0-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Add/update Heiko Becker in upstream signing keys.
+   * New upstream release (24.12.0).
+   * Update build-deps and deps with the info from cmake.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Sat, 14 Dec 2024 15:36:39 +0100
+ 
+ kldap (24.08.2-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (24.08.2).
+   * Update build-deps and deps with the info from cmake.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Sat, 12 Oct 2024 15:02:04 +0200
+ 
+ kldap (24.08.0-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (24.08.0).
+   * Update build-deps and deps with the info from cmake and new binary
+     packages.
+   * Do not rely on dpkg_late_eval any more to set the ABI-version for
+     the virtual package.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Sat, 24 Aug 2024 22:56:33 +0200
+ 
+ kldap (24.05.2-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (24.05.2).
+   * Remove redundant patches.
+   * Update build-deps and deps with the info from cmake.
+   * Create new packages.
+   * Bump Standards-Version to 4.7.0 (no changes needed).
+   * Update d/copyright.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Wed, 10 Jul 2024 19:08:55 +0200
  
  kldap (22.12.3-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge