Merge version 2:4.19.2+dfsg-1+rpi1 and 2:4.19.4+dfsg-3 to produce 2:4.19.4+dfsg-3...

diff --cc debian/changelog
index 78135c81a62d83d8800ba9cab56f917a2392989f,129bc1be9d0046b3065bb9ca50e2043616be0ddf..98e73dc09b1944cae1b931cf538c2bf2ea013d60
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,79 +1,86 @@@
- samba (2:4.19.2+dfsg-1+rpi1) trixie-staging; urgency=medium
++samba (2:4.19.4+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>  Sat, 28 Oct 2023 03:57:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 10 Feb 2024 08:06:24 +0000
++
+ samba (2:4.19.4+dfsg-3) unstable; urgency=medium
+ 
+   * samba,winbind: remove logrotate scripts
+     samba does its own log rotation (max log size (=5000 by default) and renaming
+     to .old).  The two clashes with each other in an interesting way.
+   * d/samba-libs.symbols, d/control: make libndrN a virtual package to ensure rdeps
+     pick the right dependency
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Tue, 30 Jan 2024 12:12:42 +0300
+ 
+ samba (2:4.19.4+dfsg-2) unstable; urgency=medium
+ 
+   * d/samba.smbd.service, d/samba.nmbd.service: expand forgotten @BINDIR@
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Mon, 08 Jan 2024 20:44:51 +0300
+ 
+ samba (2:4.19.4+dfsg-1) unstable; urgency=medium
+ 
+   * new upstream stable/bugfix release. See WHATSNEW.txt for details.
+   * d/control: drop pkg.samba.nouring build profile: was needed
+     for focal which we do not support anymore
+   * remove /etc/cron.daily/samba: there's no reason to keep backing it up,
+     most stuff is in ldb/tdb files these days.
+   * d/samba.maintscript, d/winbind.maintscript:
+     remove old rm_connfiles (pre-buster versions)
+   * d/rules, d/*.service: provide .service files directly instead of renaming
+     and patching upstream templates, and use dh_installsystemd to install them
+     (partially Closes: #1059187)
+   * d/rules: run dh_movetousr for libpam-winbind & libnss-winbind, if exists.
+     This fixes remaining files in /lib (hopefully). In a search for better
+     way to detect where to put system libs (/lib vs /usr/lib) as a configure
+     option.  Closes: #1059187
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Mon, 08 Jan 2024 19:11:37 +0300
+ 
+ samba (2:4.19.3+dfsg-2) unstable; urgency=medium
+ 
+   * d/rules: simplify LDFLAGS assignment
+   * d/rules: add -mlong-jump-table-offsets to CFLAGS on m68k (fix FTBFS there)
+   * d/rules: CFLAGS += -ffile-prefix-map=../../=
+   * d/control: fix versioned dependency on samba for samba-ad-dc
+   * +python-fix-invalid-escape-sequences.patch from upstream (Closes: #1057668)
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Mon, 11 Dec 2023 13:19:18 +0300
+ 
+ samba (2:4.19.3+dfsg-1) unstable; urgency=medium
+ 
+   * new upstream stable/bugfix release:
+    - https://bugzilla.samba.org/show_bug.cgi?id=13595
+      CVE-2018-14628 [SECURITY] Deleted Object tombstones visible in AD LDAP
+      to normal users (Closes: #1034803).  Please see WHATSNEW.txt file for
+      more information about this issue: actual fix requires extra steps to
+      be performed against samba-based AD-DC
+    - https://bugzilla.samba.org/show_bug.cgi?id=15093
+      Files without "read attributes" NFS4 ACL permission are not listed
+      in directories
+    - https://bugzilla.samba.org/show_bug.cgi?id=15487
+      smbd crashes if asked to return full information on close of
+      a stream handle with delete on close disposition set
+    - https://bugzilla.samba.org/show_bug.cgi?id=15492
+      Kerberos TGS-REQ with User2User does not work for normal accounts
+    - https://bugzilla.samba.org/show_bug.cgi?id=15499
+      Improve logging for failover scenarios
+    - https://bugzilla.samba.org/show_bug.cgi?id=15507
+      vfs_gpfs stat calls fail due to file system permissions
+    - https://bugzilla.samba.org/show_bug.cgi?id=15513
+      Samba doesn't build with Python 3.12
+    - https://bugzilla.samba.org/show_bug.cgi?id=15520
+      sid_strings test broken by unix epoch > 1700000000
+    - https://bugzilla.samba.org/show_bug.cgi?id=15521
+      smbd: fix close order of base_fsp and stream_fsp
+      in smb_fname_fsp_destructor()
+   * d/samba-common.maintscript: fix version number for dhcp hook removal
+     (Closes: #1053780)
+ 
+  -- Michael Tokarev <mjt@tls.msk.ru>  Mon, 27 Nov 2023 22:22:54 +0300
  
  samba (2:4.19.2+dfsg-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge