From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 11 Nov 2023 03:32:52 +0000 (+0000)
Subject: Merge version 3.4-1+rpi1 and 3.4.1-1 to produce 3.4.1-1+rpi1
X-Git-Tag: archive/raspbian/3.4.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=feb8609c1681fd6d2085dfc625e101819a5988a9;p=poedit.git

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

feb8609c1681fd6d2085dfc625e101819a5988a9
diff --cc debian/changelog
index 330b211,e5fed73..c7a7456
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- poedit (3.4-1+rpi1) trixie-staging; urgency=medium
++poedit (3.4.1-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>  Fri, 20 Oct 2023 22:31:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 11 Nov 2023 03:32:52 +0000
++
+ poedit (3.4.1-1) unstable; urgency=medium
+ 
+   * New upstream version 3.4.1
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 03 Nov 2023 10:41:20 +0100
  
  poedit (3.4-1) unstable; urgency=medium