Merge version 3.4-1+rpi1 and 3.4.1-1 to produce 3.4.1-1+rpi1

diff --cc debian/changelog
index 330b2111e5a4a891f1f6fc6ebc18e997867070c6,e5fed73cbb754c933a56b2cbf2c96f63f75c08db..c7a74565c1d4f66c84140d6341e7b3835af2efdb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- poedit (3.4-1+rpi1) trixie-staging; urgency=medium
++poedit (3.4.1-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 3.0.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 01 May 2022 11:16:49 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 20 Oct 2023 22:31:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 11 Nov 2023 03:32:52 +0000
++
+ poedit (3.4.1-1) unstable; urgency=medium
+ 
+   * New upstream version 3.4.1
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 03 Nov 2023 10:41:20 +0100
  
  poedit (3.4-1) unstable; urgency=medium