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

diff --cc debian/changelog
index 4cc62b95c0d72639dc659bf6996c9bac6cdc9562,eeb5d733403334cac18e97cd20fd51db3d9d764d..d29a2b7dc7c7450019e8372e0599c8096066e404
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- poedit (3.1.1-1+rpi1) bookworm-staging; urgency=medium
++poedit (3.1.1-2+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>  Thu, 28 Jul 2022 12:27:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 20 Sep 2022 17:35:47 +0000
++
+ poedit (3.1.1-2) unstable; urgency=medium
+ 
+   * Switch to wxwidgets 3.2
+   * Drop as-needed flag, now default
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 13 Sep 2022 00:29:18 +0200
  
  poedit (3.1.1-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge