Merge version 2:4.22.0+dfsg-1+rpi1 and 2:4.22.0+dfsg-2 to produce 2:4.22.0+dfsg-2...

diff --cc debian/changelog
index dabe789599e163cc64458d3a1226f132c9f93672,f526de8a41ab59db7401bc7f594a37e3d19f049a..490a8166b452bacb1e8d6658d35954a654ffce74
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- samba (2:4.22.0+dfsg-1+rpi1) trixie-staging; urgency=medium
++samba (2:4.22.0+dfsg-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2:4.19.1+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 12 Oct 2023 15:37:21 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 20 Mar 2025 20:37:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 03 Apr 2025 15:51:01 +0000
++
+ samba (2:4.22.0+dfsg-2) unstable; urgency=medium
+ 
+   * smbd-fix-handling-of-directory-leases-and-oplock-lev.patch
+     (Closes: #1100604)
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Sat, 29 Mar 2025 07:24:47 +0300
  
  samba (2:4.22.0+dfsg-1) unstable; urgency=medium