Merge version 2.3.1+dfsg1-1+rpi1 and 2.3.4+dfsg1-1.1 to produce 2.3.4+dfsg1-1.1+rpi1

diff --cc debian/changelog
index 84dd6842c0f8614a01e055b424aa1337d85bb114,dd19994a3a41f0979c4be3f7fa6fcae389b5a30c..2bec770192f8b3b9c5bec5674d6d10a15f94269c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,30 @@@
- 389-ds-base (2.3.1+dfsg1-1+rpi1) bookworm-staging; urgency=medium
++389-ds-base (2.3.4+dfsg1-1.1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.4.0.19-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 27 Dec 2018 01:27:25 +0000]
 +  * Add -latomic to LDFLAGS on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Jan 2023 03:00:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 06 Jan 2024 19:53:44 +0000
++
+ 389-ds-base (2.3.4+dfsg1-1.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Add librust-clap-3-dev on B-D. (Closes: #1052626)
+ 
+  -- Bo YU <tsu.yubo@gmail.com>  Thu, 28 Dec 2023 15:26:49 +0800
+ 
+ 389-ds-base (2.3.4+dfsg1-1) unstable; urgency=medium
+ 
+   [ Timo Aaltonen ]
+   * New upstream release.
+   * patches: Drop upstreamed or obsolete patches.
+   * control: Add dependency on python3-cryptography.
+ 
+   [ Peter Michael Green ]
+   * Improve clean target.
+   * Use ln -fs instead of ln -s to allow resuming build after fixing errors.
+   * Fix build with base64 0.21. (Closes: #1037345)
+ 
+  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 19 Jun 2023 19:13:30 +0300
  
  389-ds-base (2.3.1+dfsg1-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge