Merge version 2:4.22.2+dfsg-1+rpi1 and 2:4.22.3+dfsg-4 to produce 2:4.22.3+dfsg-4...

diff --cc debian/changelog
index f51786efc8ecc0223dd22d97063ae40d9833d86c,d0d592c98503cff216c11ddbf36f0ed6f6e5e989..e75be2ebe648dd972385dc77ff1f3b94f50d9a0b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,75 +1,82 @@@
- samba (2:4.22.2+dfsg-1+rpi1) trixie-staging; urgency=medium
++samba (2:4.22.3+dfsg-4+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 20 Jun 2025 03:12:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Aug 2025 10:32:50 +0000
++
+ samba (2:4.22.3+dfsg-4) unstable; urgency=medium
+ 
+   * fix python3-talloc.symbols generation to not have -debian_revision
+     or +dfsg/+samba suffix in the version number - just the epoch if any
+     and the upstream version (fix lintian error)
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Thu, 17 Jul 2025 13:52:35 +0300
+ 
+ samba (2:4.22.3+dfsg-3) unstable; urgency=medium
+ 
+   [ Sascha Lucas ]
+   * winbind pam-config: fix account section to actually execute pam_winbind
+     entries after usually successful cal to pam_unix, in a way how it's done
+     in sssd (Closes: #907318)
+ 
+   [ Douglas Bagnall ]
+   * debian/panic-action: make the wording more user-friendly and steer users
+     towards configuration and logs (Closes: #1089853)
+ 
+   [ Michael Tokarev ]
+   * d/python3-talloc.symbols.in: add forgotten epoch number for recent versions
+     (this doesn't actually affect anything since there were no new symbols with
+     these versions, but it's better to stay correct)
+   * d/control: fix winbind:Enhances for libkrb5-26-heimdal which
+     is libkrb5-26t64-heimdal in trixie and up, keeping in mind possible
+     backporting to older debian/ubuntu versions (before-trixie build profile)
+   * libads-fix-get_kdc_ip_string.patch (upstream fix for #1109005)
+     (Closes: #1109005)
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Tue, 15 Jul 2025 12:42:04 +0300
+ 
+ samba (2:4.22.3+dfsg-2) unstable; urgency=medium
+ 
+   * Revert "d/control,d/rules: ensure we use the most recent talloc/tevent/tdb"
+     There's no need for samba-libs to depend on exact versions of support libs
+     anymore, since 4.21.3+dfsg-5 (where the mistake has been made) is long gone
+   * Revert "d/control: add conflicts/breaks for libtevent0t64 on mjt repo"
+     This Breaks was special and temporary, and not useful for debian archive at
+     all (it was only needed for mjt's own repository where the wrong package
+     name slipped out once).  Remove this cruft for trixie
+   * python3-talloc.symbols[.in] -- provide long-forgotten symbols file, so that
+     versioned dependency on python3-talloc (mostly for python3-samba) will be
+     less strict.  For smoother upgrades
+   * document forgotten change in previous changelog entry
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Wed, 09 Jul 2025 17:08:31 +0300
+ 
+ samba (2:4.22.3+dfsg-1) unstable; urgency=medium
+ 
+   * new upstream stable/bugfix release, mostly targetting the Jul-08 update
+     for Active Directory Domain Controllers
+     (https://bugzilla.samba.org/show_bug.cgi?id=15876, Closes: #1108904):
+    - https://bugzilla.samba.org/show_bug.cgi?id=15854:
+      samba-tool cannot add user to group whose name
+      is exactly 16 characters long
+    - https://bugzilla.samba.org/show_bug.cgi?id=15869:
+      Startup messages of rpc daemons fills /var/log/messages
+    - https://bugzilla.samba.org/show_bug.cgi?id=15876:
+      Windows security hardening locks out schannel'ed netlogon
+      dc calls like netr_DsRGetDCName
+   * update d/copyright to point to https://www.gnu.org/licenses/
+     instead of FSF postal address
+   * d/control: stop depending on exact same version of samba-common
+     Package samba-common contains a few files/dirs common for several samba
+     packages.  Its contents hasn't changed for quite some time.  There's
+     definitely no need to depend on exact version of this package - eg, 4.17
+     (from bookworm) will work just fine with samba version 4.22.  Drop version
+     requirement for samba-common dep entirely.  If/when we have real change in
+     samba-common which is needed by other packages, we can specify particular
+     version there.  For smoother upgrades
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Mon, 07 Jul 2025 23:16:23 +0300
  
  samba (2:4.22.2+dfsg-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge