From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 22 Feb 2018 00:44:19 +0000 (+0000)
Subject: Merge version 4.1.0-2+rpi1 and 4.1.1-1 to produce 4.1.1-1+rpi1
X-Git-Tag: archive/raspbian/4.1.1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d1bcafe61ad0c4de34793c3cb633ddb7de4d7fad;p=pdns.git

Merge version 4.1.0-2+rpi1 and 4.1.1-1 to produce 4.1.1-1+rpi1
---

d1bcafe61ad0c4de34793c3cb633ddb7de4d7fad
diff --cc debian/changelog
index d314b1b,03da481..6d43938
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- pdns (4.1.0-2+rpi1) buster-staging; urgency=medium
++pdns (4.1.1-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>  Sat, 27 Jan 2018 08:40:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 22 Feb 2018 00:44:18 +0000
++
+ pdns (4.1.1-1) unstable; urgency=medium
+ 
+   * Replace obsolete priority extra with optional
+   * New upstream version 4.1.1
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Fri, 16 Feb 2018 10:49:37 +0000
  
  pdns (4.1.0-2) unstable; urgency=medium