From: Raspbian forward pporter <root@raspbian.org>
Date: Tue, 4 Sep 2018 09:05:33 +0000 (+0100)
Subject: Merge version 4.1.3-5+rpi1 and 4.1.4-1 to produce 4.1.4-1+rpi1
X-Git-Tag: archive/raspbian/4.1.4-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2c9737f94f6174ea7e66e077e40fe9a20c773e7f;p=pdns.git

Merge version 4.1.3-5+rpi1 and 4.1.4-1 to produce 4.1.4-1+rpi1
---

2c9737f94f6174ea7e66e077e40fe9a20c773e7f
diff --cc debian/changelog
index 6187eaf,3b6ecb7..35a45a3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- pdns (4.1.3-5+rpi1) buster-staging; urgency=medium
++pdns (4.1.4-1+rpi1) buster-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Aug 2018 16:24:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 04 Sep 2018 09:05:32 +0000
++
+ pdns (4.1.4-1) unstable; urgency=medium
+ 
+   * New upstream version 4.1.4
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Wed, 29 Aug 2018 18:21:52 +0000
  
  pdns (4.1.3-5) unstable; urgency=medium