From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 7 Dec 2019 06:30:26 +0000 (+0000)
Subject: Merge version 4.2.0-1+rpi1 and 4.2.1-1 to produce 4.2.1-1+rpi1
X-Git-Tag: archive/raspbian/4.2.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ef08b11cc7113fb5f3fb9707649a24fc6c59ba37;p=pdns.git

Merge version 4.2.0-1+rpi1 and 4.2.1-1 to produce 4.2.1-1+rpi1
---

ef08b11cc7113fb5f3fb9707649a24fc6c59ba37
diff --cc debian/changelog
index c90d789,1d71911..554c915
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- pdns (4.2.0-1+rpi1) bullseye-staging; urgency=medium
++pdns (4.2.1-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4.1.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 31 Dec 2017 14:27:56 +0000]
 +  * Add -latomic to ldflags.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 18 Sep 2019 00:17:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Dec 2019 06:30:25 +0000
++
+ pdns (4.2.1-1) unstable; urgency=medium
+ 
+   * New upstream version 4.2.1
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Mon, 02 Dec 2019 22:47:13 +0000
  
  pdns (4.2.0-1) unstable; urgency=medium