From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 19 May 2025 10:46:53 +0000 (+0100)
Subject: Merge version 2.14.0-4+rpi1 and 2.14.0-5 to produce 2.14.0-5+rpi1
X-Git-Tag: archive/raspbian/2.14.0-5+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=762915375a6dcf2ae46a0f438a4cbe63e820421a;p=dnsperf.git

Merge version 2.14.0-4+rpi1 and 2.14.0-5 to produce 2.14.0-5+rpi1
---

762915375a6dcf2ae46a0f438a4cbe63e820421a
diff --cc debian/changelog
index 230c3ab,b466169..156a0f1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- dnsperf (2.14.0-4+rpi1) trixie-staging; urgency=medium
++dnsperf (2.14.0-5+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2.14.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Jun 2024 15:05:56 +0000]
 +  * link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 30 Mar 2025 20:18:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 19 May 2025 10:46:53 +0000
++
+ dnsperf (2.14.0-5) sid; urgency=medium
+ 
+   * Simplifying watch file.
+ 
+  -- Daniel Baumann <daniel@debian.org>  Fri, 02 May 2025 04:50:00 +0200
  
  dnsperf (2.14.0-4) sid; urgency=medium