From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 3 Oct 2024 00:09:37 +0000 (+0100)
Subject: Merge version 2.14.0-1+rpi1 and 2.14.0-2 to produce 2.14.0-2+rpi1
X-Git-Tag: archive/raspbian/2.14.0-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=faabe564ef4925dc1511ed7f130d1225f747d007;p=dnsperf.git

Merge version 2.14.0-1+rpi1 and 2.14.0-2 to produce 2.14.0-2+rpi1
---

faabe564ef4925dc1511ed7f130d1225f747d007
diff --cc debian/changelog
index 16cc7a1,08e5e9b..a3daf2a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,17 @@@
- dnsperf (2.14.0-1+rpi1) trixie-staging; urgency=medium
++dnsperf (2.14.0-2+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 20 Jun 2024 15:05:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 03 Oct 2024 00:09:37 +0000
++
+ dnsperf (2.14.0-2) sid; urgency=medium
+ 
+   * Uploading to sid.
+   * Updating copyright for 2024.
+   * Updating to standards-version 4.7.0.
+ 
+  -- Daniel Baumann <daniel.baumann@progress-linux.org>  Thu, 25 Jul 2024 06:31:49 +0200
  
  dnsperf (2.14.0-1) sid; urgency=medium