From: Raspbian forward pporter <root@raspbian.org>
Date: Sat, 27 Jan 2018 08:40:07 +0000 (+0000)
Subject: Merge version 4.1.0-1+rpi1 and 4.1.0-2 to produce 4.1.0-2+rpi1
X-Git-Tag: archive/raspbian/4.1.0-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4ee307b0ab9384c0c61d0fa7f0619a963182a241;p=pdns.git

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

4ee307b0ab9384c0c61d0fa7f0619a963182a241
diff --cc debian/changelog
index f12e1fe,ebae3fa..d314b1b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,17 @@@
- pdns (4.1.0-1+rpi1) buster-staging; urgency=medium
++pdns (4.1.0-2+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 31 Dec 2017 14:27:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 27 Jan 2018 08:40:07 +0000
++
+ pdns (4.1.0-2) unstable; urgency=medium
+ 
+   * Update Maintainer: as alioth is going away
+   * Update Vcs-* URLs to point to salsa.debian.org
+   * Bump Standards-Version to 4.1.3 (no changes)
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Thu, 18 Jan 2018 20:44:07 +0000
  
  pdns (4.1.0-1) unstable; urgency=medium