From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 17 Apr 2025 13:25:27 +0000 (+0100)
Subject: Merge version 3.5.2-2+rpi1 and 3.6-1 to produce 3.6-1+rpi1
X-Git-Tag: raspbian/3.6-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8819e570b08a79a99bfad0e2bb3e43345b6fca22;p=poedit.git

Merge version 3.5.2-2+rpi1 and 3.6-1 to produce 3.6-1+rpi1
---

e6bda8744a371f62c139ad74b52ce90a1a50bf75
diff --cc debian/changelog
index 6a8bab0,ede3d58..f9a5084
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- poedit (3.5.2-2+rpi1) trixie-staging; urgency=medium
++poedit (3.6-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>  Thu, 12 Dec 2024 06:27:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 17 Apr 2025 13:25:27 +0000
++
+ poedit (3.6-1) unstable; urgency=medium
+ 
+   * New upstream version 3.6
+   * Bump copyright years
+   * Bump std-version to 4.7.2
+   * Drop patch, now upstream
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 08 Apr 2025 07:39:19 +0200
  
  poedit (3.5.2-2) unstable; urgency=medium