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

diff --cc debian/changelog
index a12eaad9976cff3fcafc3464d3802cd02a04ae30,058f44ee40db83a07cf07a401a3842761796f934..edd6b643ff082da3f486eae327a14634495b3b2e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,10 +1,17 @@@
- poedit (3.0.1-1+rpi1) bookworm-staging; urgency=medium
++poedit (3.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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 01 May 2022 11:16:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 21 Jul 2022 14:31:35 +0000
 +
- poedit (3.0.1-1) unstable; urgency=medium
+ poedit (3.1-1) unstable; urgency=medium
  
-   [ Debian Janitor ]
-   * Refer to common license file for CC0-1.0.
+   * New upstream version 3.1
+   * Update copyright years
+   * Update std-version to 4.6.1
  
-   [ Andreas Rönnquist ]
-   * New upstream version 3.0.1
-   * Upgrade to Standards-Version 4.6.0.1 (No changes required)
- 
-  -- Andreas Rönnquist <gusnan@debian.org>  Tue, 14 Dec 2021 15:38:45 +0100
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 10 Jun 2022 13:14:23 +0200
  
  poedit (3.0-6) unstable; urgency=medium