From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 30 Nov 2020 07:49:38 +0000 (+0000)
Subject: Merge version 4.3.1-1+rpi1 and 4.3.1-2 to produce 4.3.1-2+rpi1
X-Git-Tag: archive/raspbian/4.3.1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f454939d868fdcba3e758e590e9c48b054dfd9a0;p=pdns.git

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

f454939d868fdcba3e758e590e9c48b054dfd9a0
diff --cc debian/changelog
index ce0b0de,41b07ff..230d1a6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- pdns (4.3.1-1+rpi1) bullseye-staging; urgency=medium
++pdns (4.3.1-2+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 28 Sep 2020 09:10:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 30 Nov 2020 07:49:38 +0000
++
+ pdns (4.3.1-2) unstable; urgency=medium
+ 
+   * Apply upstream patch to improve MySQL 8 character handling
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Wed, 25 Nov 2020 21:16:04 +0000
  
  pdns (4.3.1-1) unstable; urgency=medium