diff -Nru ldns-1.7.0/debian/changelog ldns-1.7.0/debian/changelog
--- ldns-1.7.0/debian/changelog	2020-01-25 12:55:18.000000000 +0000
+++ ldns-1.7.0/debian/changelog	2020-04-13 01:12:45.000000000 +0000
@@ -1,3 +1,17 @@
+ldns (1.7.0-4.1ubuntu1) focal; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - Build-Depend on python-all-dev.
+
+ -- William Grant <wgrant@ubuntu.com>  Mon, 13 Apr 2020 11:12:45 +1000
+
+ldns (1.7.0-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use upstream patch to fix FTBFS with SWIG 4.0 (Closes: #951899)
+
+ -- Ivo De Decker <ivodd@debian.org>  Fri, 20 Mar 2020 13:39:43 +0000
+
 ldns (1.7.0-4ubuntu1) focal; urgency=medium
 
   * Build-depend on python-all-dev.
diff -Nru ldns-1.7.0/debian/control ldns-1.7.0/debian/control
--- ldns-1.7.0/debian/control	2020-01-25 12:55:18.000000000 +0000
+++ ldns-1.7.0/debian/control	2020-04-13 01:12:45.000000000 +0000
@@ -1,6 +1,7 @@
 Source: ldns
 Priority: optional
-Maintainer: Debian DNS Team <team+dns@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian DNS Team <team+dns@tracker.debian.org>
 Uploaders: Ondřej Surý <ondrej@debian.org>
 Build-Depends: chrpath,
                debhelper-compat (= 12),
diff -Nru ldns-1.7.0/debian/patches/series ldns-1.7.0/debian/patches/series
--- ldns-1.7.0/debian/patches/series	2019-03-10 21:56:02.000000000 +0000
+++ ldns-1.7.0/debian/patches/series	2020-04-13 01:12:44.000000000 +0000
@@ -1,2 +1,3 @@
 0002-Check-parse-limit-before-t-increment.patch
 0003-bugfix-1257-Free-after-reallocing-to-0-size.patch
+swig4.0-support-from-jitka-plesnkov.patch
diff -Nru ldns-1.7.0/debian/patches/swig4.0-support-from-jitka-plesnkov.patch ldns-1.7.0/debian/patches/swig4.0-support-from-jitka-plesnkov.patch
--- ldns-1.7.0/debian/patches/swig4.0-support-from-jitka-plesnkov.patch	1970-01-01 00:00:00.000000000 +0000
+++ ldns-1.7.0/debian/patches/swig4.0-support-from-jitka-plesnkov.patch	2020-04-13 01:12:44.000000000 +0000
@@ -0,0 +1,19 @@
+From: Willem Toorop <willem@nlnetlabs.nl>
+Date: Thu, 11 Jul 2019 10:42:25 +0200
+X-Dgit-Generated: 1.7.0-4.1 6ccdc0607e77a131cd742be8c7e388fd912512f1
+Subject: SWIG4.0 support from Jitka Plesníková
+
+
+---
+
+--- ldns-1.7.0.orig/contrib/python/ldns_key.i
++++ ldns-1.7.0/contrib/python/ldns_key.i
+@@ -41,7 +41,7 @@
+   $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr($1_key), SWIGTYPE_p_ldns_struct_key, SWIG_POINTER_OWN |  0 ));
+ }
+ 
+-%exception ldns_key_set_pubkey_owner(ldns_key *k, ldns_rdf *r)  %{ $action Py_INCREF(obj1); %}
++%typemap(argout) ldns_rdf *r "Py_INCREF($input);"
+ 
+ %nodefaultctor ldns_struct_key; //no default constructor & destructor
+ %nodefaultdtor ldns_struct_key;