Merge version 3.1.1-2+rpi1 and 3.2-1 to produce 3.2-1+rpi1

diff --cc debian/changelog
index d29a2b7dc7c7450019e8372e0599c8096066e404,6b0be742d88dfcfe6777c42b5c709f07d1af3937..e2115f9281792b770af3608431a1ad7144158393
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,20 @@@
- poedit (3.1.1-2+rpi1) bookworm-staging; urgency=medium
++poedit (3.2-1+rpi1) bookworm-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>  Tue, 20 Sep 2022 17:35:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Nov 2022 05:00:10 +0000
++
+ poedit (3.2-1) unstable; urgency=medium
+ 
+   [ Debian Janitor ]
+   * Refer to common license file for CC0-1.0.
+   * Set upstream metadata fields: Archive, Bug-Database.
+ 
+   [ Gianfranco Costamagna ]
+   * New upstream version 3.2
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 23 Oct 2022 12:23:28 +0200
  
  poedit (3.1.1-2) unstable; urgency=medium