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

diff --cc debian/changelog
index 5e0978b470f1afa253131852555e454f57d8d5fd,2a5e91cc1d0d53563ddc5806d3edcb50348a8d7b..330b2111e5a4a891f1f6fc6ebc18e997867070c6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,33 +1,40 @@@
- poedit (3.2.2-1+rpi1) bookworm-staging; urgency=medium
++poedit (3.4-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>  Sat, 10 Dec 2022 01:27:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 20 Oct 2023 22:31:21 +0000
++
+ poedit (3.4-1) unstable; urgency=medium
+ 
+   * New upstream version 3.4
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 09 Oct 2023 09:47:22 +0200
+ 
+ poedit (3.3.2-2) unstable; urgency=medium
+ 
+   * Replace libdb++-dev with libdb5.3++-dev (Closes: #1042085)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 25 Aug 2023 10:30:06 +0200
+ 
+ poedit (3.3.2-1) unstable; urgency=medium
+ 
+   * New upstream version 3.3.2
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 28 Jun 2023 07:07:02 +0200
+ 
+ poedit (3.3.1-1) unstable; urgency=medium
+ 
+   * New upstream version 3.3.1
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 22 May 2023 09:41:45 +0200
+ 
+ poedit (3.3-1) unstable; urgency=medium
+ 
+   * New upstream version 3.3
+   * Update copyright years
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 12 May 2023 11:25:44 +0200
  
  poedit (3.2.2-1) unstable; urgency=medium