From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 7 Jan 2024 01:54:12 +0000 (+0000)
Subject: Merge version 3.4.1-1+rpi1 and 3.4.2-1 to produce 3.4.2-1+rpi1
X-Git-Tag: archive/raspbian/3.4.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e54151333967a8baf6d9797a0314d9bcdc0b0195;p=poedit.git

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

e54151333967a8baf6d9797a0314d9bcdc0b0195
diff --cc debian/changelog
index c7a7456,f0a4c1f..0d39351
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- poedit (3.4.1-1+rpi1) trixie-staging; urgency=medium
++poedit (3.4.2-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>  Sat, 11 Nov 2023 03:32:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Jan 2024 01:54:11 +0000
++
+ poedit (3.4.2-1) unstable; urgency=medium
+ 
+   * New upstream version 3.4.2
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 26 Dec 2023 10:11:50 +0100
  
  poedit (3.4.1-1) unstable; urgency=medium