From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 9 Apr 2025 10:30:10 +0000 (+0100)
Subject: Merge version 2:4.22.0+dfsg-2+rpi1 and 2:4.22.0+dfsg-3 to produce 2:4.22.0+dfsg-3... 
X-Git-Tag: archive/raspbian/2%4.22.0+dfsg-3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=deacadd80ac27d5c726bea4db4432bc485168f6f;p=samba.git

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

deacadd80ac27d5c726bea4db4432bc485168f6f
diff --cc debian/changelog
index 490a8166,a53a3178..c604c19e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- samba (2:4.22.0+dfsg-2+rpi1) trixie-staging; urgency=medium
++samba (2:4.22.0+dfsg-3+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>  Thu, 03 Apr 2025 15:51:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 09 Apr 2025 10:30:10 +0000
++
+ samba (2:4.22.0+dfsg-3) unstable; urgency=medium
+ 
+   * widelinks-nofollow.patch (https://bugzilla.samba.org/show_bug.cgi?id=15841)
+     (Closes: #1101581)
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Wed, 02 Apr 2025 14:34:31 +0300
  
  samba (2:4.22.0+dfsg-2) unstable; urgency=medium