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

diff --cc debian/changelog
index edd6b643ff082da3f486eae327a14634495b3b2e,dae01153b9fbe11b00526a8a442632859b2bad88..4cc62b95c0d72639dc659bf6996c9bac6cdc9562
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- poedit (3.1-1+rpi1) bookworm-staging; urgency=medium
++poedit (3.1.1-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>  Thu, 21 Jul 2022 14:31:35 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Jul 2022 12:27:38 +0000
++
+ poedit (3.1.1-1) unstable; urgency=medium
+ 
+   * New upstream version 3.1.1
+   * Import changes of version 3.0.1-1
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 18 Jul 2022 19:34:51 +0200
  
  poedit (3.1-1) unstable; urgency=medium