From: Raspbian forward pporter <root@raspbian.org>
Date: Fri, 22 Jun 2018 04:26:40 +0000 (+0100)
Subject: Merge version 4.1.2-1+rpi1 and 4.1.3-1 to produce 4.1.3-1+rpi1
X-Git-Tag: archive/raspbian/4.1.3-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1e92f31ebd71398060ed7932b2a6a9b2fdc35bda;p=pdns.git

Merge version 4.1.2-1+rpi1 and 4.1.3-1 to produce 4.1.3-1+rpi1
---

1e92f31ebd71398060ed7932b2a6a9b2fdc35bda
diff --cc debian/changelog
index 98f10b9,27b7a8f..3525d8c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- pdns (4.1.2-1+rpi1) buster-staging; urgency=medium
++pdns (4.1.3-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>  Sun, 20 May 2018 21:29:35 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 22 Jun 2018 04:26:40 +0000
++
+ pdns (4.1.3-1) unstable; urgency=medium
+ 
+   * New upstream version 4.1.3
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Sun, 17 Jun 2018 12:25:15 +0000
  
  pdns (4.1.2-1) unstable; urgency=medium