diff -Nru dh-python-3.20180318ubuntu1/debian/changelog dh-python-3.20180325ubuntu2/debian/changelog
--- dh-python-3.20180318ubuntu1/debian/changelog	2018-03-22 17:15:19.000000000 +0000
+++ dh-python-3.20180325ubuntu2/debian/changelog	2018-03-26 19:42:23.000000000 +0000
@@ -1,9 +1,22 @@
-dh-python (3.20180318ubuntu1) bionic; urgency=medium
+dh-python (3.20180325ubuntu2) bionic; urgency=medium
 
-  * Drop dependency on dpkg-dev; it's unused and tries to pull in all
-    of build-essential et al. at runtime.  Closes: #892931.
+  * Fix typo and really depend on python3-distutils
 
- -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 22 Mar 2018 10:15:19 -0700
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 26 Mar 2018 15:42:23 -0400
+
+dh-python (3.20180325ubuntu1) bionic; urgency=medium
+
+  * Make python3-distutils a dependency, not just a recommendation.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 26 Mar 2018 19:14:03 +0800
+
+dh-python (3.20180325) unstable; urgency=medium
+
+  * pybuild: fix cross compiling stuff to use dpkg-architecture if available
+    (and move dpkg-dev to Suggests)
+  * Add python3-distuils to Recommends to make the transition easier
+
+ -- Piotr Ożarowski <piotr@debian.org>  Sun, 25 Mar 2018 22:52:36 +0200
 
 dh-python (3.20180318) unstable; urgency=medium
 
diff -Nru dh-python-3.20180318ubuntu1/debian/control dh-python-3.20180325ubuntu2/debian/control
--- dh-python-3.20180318ubuntu1/debian/control	2018-03-22 17:15:19.000000000 +0000
+++ dh-python-3.20180325ubuntu2/debian/control	2018-03-26 19:42:17.000000000 +0000
@@ -1,8 +1,7 @@
 Source: dh-python
 Section: python
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Piotr Ożarowski <piotr@debian.org>
+Maintainer: Piotr Ożarowski <piotr@debian.org>
 Uploaders: Stefano Rivera <stefanor@debian.org>, Barry Warsaw <barry@debian.org>
 Build-Depends: debhelper (>= 9), python3-minimal, libpython3-stdlib, libdpkg-perl,
 # provides rst2man command (python3-docutils not used to avoid circular deps):
@@ -19,8 +18,8 @@
 Package: dh-python
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${python3:Depends}
-Suggests: libdpkg-perl
+Depends: ${misc:Depends}, ${python3:Depends}, python3-distutils
+Suggests: libdpkg-perl, dpkg-dev
 Breaks:
 # due to /usr/bin/dh_python3 and debhelper files
  python3 (<< 3.3.2-4~)
diff -Nru dh-python-3.20180318ubuntu1/pybuild dh-python-3.20180325ubuntu2/pybuild
--- dh-python-3.20180318ubuntu1/pybuild	2018-03-18 17:24:39.000000000 +0000
+++ dh-python-3.20180325ubuntu2/pybuild	2018-03-22 21:10:26.000000000 +0000
@@ -69,12 +69,18 @@
     except KeyError:
         pass
     # support cross compiling Python 3.X extensions, see #892931
-    if not env.get('_PYTHON_SYSCONFIGDATA_NAME') and env.get('DEB_HOST_ARCH') \
-       and env['DEB_BUILD_ARCH'] != env.get('DEB_HOST_ARCH'):
-        env['_PYTHON_SYSCONFIGDATA_NAME'] = (
-            '_sysconfigdata_m'
-            '_{env[DEB_HOST_ARCH_OS]}'
-            '_{env[DEB_HOST_MULTIARCH]}').format(env=env)
+    if not env.get('_PYTHON_SYSCONFIGDATA_NAME') and exists('/usr/bin/dpkg-architecture'):
+        res = execute('/usr/bin/dpkg-architecture')
+        arch_data = {}
+        for line in res['stdout'].splitlines():
+            key, value = line.strip().split('=', 1)
+            arch_data[key] = value
+
+        if arch_data['DEB_BUILD_ARCH'] != arch_data['DEB_HOST_ARCH']:
+            env['_PYTHON_SYSCONFIGDATA_NAME'] = (
+                '_sysconfigdata_m'
+                '_{DEB_HOST_ARCH_OS}'
+                '_{DEB_HOST_MULTIARCH}').format(**arch_data)
 
     if cfg.system:
         certainty = 99
diff -Nru dh-python-3.20180318ubuntu1/pydist/cpython2_fallback dh-python-3.20180325ubuntu2/pydist/cpython2_fallback
--- dh-python-3.20180318ubuntu1/pydist/cpython2_fallback	2018-03-13 22:08:44.000000000 +0000
+++ dh-python-3.20180325ubuntu2/pydist/cpython2_fallback	2018-03-25 20:51:33.000000000 +0000
@@ -131,6 +131,7 @@
 JCC jcc
 JPype1 python-jpype
 Jinja2 python-jinja2
+JsonTest python-jsontest
 Kajiki python-kajiki
 Kivy python-kivy
 LEPL python-lepl
@@ -766,6 +767,7 @@
 cvs2svn cvs2svn
 cvxopt python-cvxopt
 cwiid python-cwiid
+cwltool cwltool
 cwm python-swap
 cycler python-cycler
 cyclone python-cyclone
@@ -795,7 +797,6 @@
 deprecation python-deprecation
 derpconf python-derpconf
 descartes python-descartes
-designate_dashboard python-designate-dashboard
 dexml python-dexml
 dfdatetime python-dfdatetime
 dfvfs python-dfvfs
@@ -893,6 +894,7 @@
 django_pyscss python-django-pyscss
 django_python3_ldap python-django-python3-ldap
 django_q python-django-q
+django_ranged_response python-django-ranged-response
 django_ratelimit python-django-ratelimit
 django_recurrence python-django-recurrence
 django_redis python-django-redis
@@ -931,6 +933,7 @@
 djextdirect python-django-extdirect
 djoser python-djoser
 dkimpy python-dkim
+dkimpy_milter dkimpy-milter
 dnslib python-dnslib
 dnspython python-dnspython
 dnsq python-dnsq
@@ -1531,7 +1534,6 @@
 munch python-munch
 munkres python-munkres
 murano_agent murano-agent
-murano_dashboard python-murano-dashboard
 murano_pkg_check python-murano-pkg-check
 musicbrainzngs python-musicbrainzngs
 mutagen python-mutagen
@@ -1569,7 +1571,6 @@
 netmiko python-netmiko
 netsnmp_python python-netsnmp
 netsyslog python-netsyslog
-networking_arista python-networking-arista
 networking_l2gw python-networking-l2gw
 networking_mlnx python-networking-mlnx
 networking_ovs_dpdk python-networking-ovs-dpdk
@@ -1802,7 +1803,6 @@
 pprofile python-pprofile
 preggy python-preggy
 prelude python-prelude
-prelude_correlator prelude-correlator
 prelude_notify prelude-notify
 preludedb python-preludedb
 preprocess preprocess
@@ -1810,7 +1810,6 @@
 presentty presentty
 pretend python-pretend
 prettytable python-prettytable
-prewikka prewikka
 prioritized_methods python-peak.rules
 proboscis python-proboscis
 profitbricks python-profitbricks
@@ -1873,7 +1872,6 @@
 pyalsa python-pyalsa
 pyalsaaudio python-alsaaudio
 pyaml python-pretty-yaml
-pyapi_gitlab python-gitlab
 pyasn1 python-pyasn1
 pyasn1_modules python-pyasn1-modules
 pyassimp python-pyassimp
@@ -2163,6 +2161,7 @@
 python_gammu python-gammu
 python_geohash python-geohash
 python_gflags python-gflags
+python_gitlab python-gitlab
 python_glanceclient python-glanceclient
 python_glareclient python-glareclient
 python_gnupg python-gnupg
@@ -2400,7 +2399,6 @@
 sage sagemath-common
 sagenb python-sagenb
 sagenb_export python-sagenb-export
-sahara_dashboard python-sahara-dashboard
 sanlock_python python-sanlock
 sardana python-sardana
 sasmodels python-sasmodels
@@ -2587,7 +2585,6 @@
 tahoe_lafs tahoe-lafs
 tails_installer tails-installer
 tap.py python-tap
-tap_as_a_service python-neutron-taas
 taskflow python-taskflow
 taskw python-taskw
 taurus python-taurus
@@ -2664,8 +2661,6 @@
 tritium tritium
 trollius python-trollius
 trollius_redis python-trollius-redis
-trove python-trove
-trove_dashboard python-trove-dashboard
 tryton tryton-client
 ttb ttb
 ttystatus python-ttystatus
@@ -2831,7 +2826,6 @@
 yum_metadata_parser python-sqlitecachec
 zabbix_cli zabbix-cli
 zake python-zake
-zaqar_ui python-zaqar-ui
 zc.buildout python-zc.buildout
 zc.customdoctests python-zc.customdoctests
 zc.lockfile python-zc.lockfile
diff -Nru dh-python-3.20180318ubuntu1/pydist/cpython3_fallback dh-python-3.20180325ubuntu2/pydist/cpython3_fallback
--- dh-python-3.20180318ubuntu1/pydist/cpython3_fallback	2018-03-13 22:08:44.000000000 +0000
+++ dh-python-3.20180325ubuntu2/pydist/cpython3_fallback	2018-03-25 20:51:33.000000000 +0000
@@ -500,6 +500,12 @@
 cement python3-cement
 certbot python3-certbot
 certbot_apache python3-certbot-apache
+certbot_dns_cloudflare python3-certbot-dns-cloudflare
+certbot_dns_digitalocean python3-certbot-dns-digitalocean
+certbot_dns_dnsimple python3-certbot-dns-dnsimple
+certbot_dns_google python3-certbot-dns-google
+certbot_dns_rfc2136 python3-certbot-dns-rfc2136
+certbot_dns_route53 python3-certbot-dns-route53
 certbot_nginx python3-certbot-nginx
 certifi python3-certifi
 cffi python3-cffi
@@ -619,6 +625,7 @@
 deprecation python3-deprecation
 descartes python3-descartes
 designate python3-designate
+designate_dashboard python3-designate-dashboard
 devscripts devscripts
 dexml python3-dexml
 dfdatetime python3-dfdatetime
@@ -716,6 +723,7 @@
 django_pyscss python3-django-pyscss
 django_python3_ldap python3-django-python3-ldap
 django_q python3-django-q
+django_ranged_response python3-django-ranged-response
 django_ratelimit python3-django-ratelimit
 django_recurrence python3-django-recurrence
 django_redis python3-django-redis
@@ -754,6 +762,7 @@
 djvubind djvubind
 dkimpy python3-dkim
 dna_jellyfish python3-dna-jellyfish
+dns_lexicon python3-lexicon
 dnsdiag dnsdiag
 dnslib python3-dnslib
 dnspython python3-dnspython
@@ -853,6 +862,7 @@
 flask_multistatic python3-flaskext.multistatic
 flask_peewee python3-flask-peewee
 flask_rdf python3-flask-rdf
+flatlatex python3-flatlatex
 flexmock python3-flexmock
 flickrapi python3-flickrapi
 flufl.bounce python3-flufl.bounce
@@ -1037,6 +1047,7 @@
 irc python3-irc
 irclog2html irclog2html
 ironic python3-ironic
+ironic_inspector python3-ironic-inspector
 ironic_lib python3-ironic-lib
 ironic_ui python3-ironic-ui
 isbnlib python3-isbnlib
@@ -1177,7 +1188,7 @@
 magic_wormhole_transit_relay magic-wormhole-transit-relay
 magnum python3-magnum
 mailer python3-mailer
-mailman mailman3-core
+mailman mailman3
 mailman_hyperkitty python3-mailman-hyperkitty
 mailmanclient python3-mailmanclient
 manila python3-manila
@@ -1247,6 +1258,7 @@
 munch python3-munch
 munkres python3-munkres
 murano python3-murano
+murano_dashboard python3-murano-dashboard
 murano_pkg_check python3-murano-pkg-check
 musicbrainzngs python3-musicbrainzngs
 mutagen python3-mutagen
@@ -1274,7 +1286,10 @@
 netfilter python3-netfilter
 netifaces python3-netifaces
 netmiko python3-netmiko
+networking_arista python3-networking-arista
+networking_l2gw python3-networking-l2gw
 networking_ovn python3-networking-ovn
+networking_sfc python3-networking-sfc
 networkx python3-networkx
 neutron python3-neutron
 neutron_dynamic_routing python3-neutron-dynamic-routing
@@ -1303,6 +1318,7 @@
 nova python3-nova
 npm2deb npm2deb
 nrpe_ng nrpe-ng
+ntlm_auth python3-ntlm-auth
 ntplib python3-ntplib
 numba python3-numba
 numexpr python3-numexpr
@@ -1495,9 +1511,11 @@
 prawcore python3-prawcore
 precis_i18n python3-precis-i18n
 prelude python3-prelude
+prelude_correlator prelude-correlator
 preludedb python3-preludedb
 pretend python3-pretend
 prettytable python3-prettytable
+prewikka prewikka
 proboscis python3-proboscis
 profitbricks python3-profitbricks
 progress python3-progress
@@ -1546,7 +1564,6 @@
 pyacoustid python3-acoustid
 pyaes python3-pyaes
 pyaml python3-pretty-yaml
-pyapi_gitlab python3-gitlab
 pyasn1 python3-pyasn1
 pyasn1_modules python3-pyasn1-modules
 pyassimp python3-pyassimp
@@ -1767,6 +1784,7 @@
 python_fedora python3-fedora
 python_gammu python3-gammu
 python_gflags python3-gflags
+python_gitlab python3-gitlab
 python_glanceclient python3-glanceclient
 python_glareclient python3-glareclient
 python_gnupg python3-gnupg
@@ -1839,6 +1857,7 @@
 python_u2flib_server python3-u2flib-server
 python_utils python3-python-utils
 python_vagrant python3-vagrant
+python_vitrageclient python3-vitrageclient
 python_watcherclient python3-watcherclient
 python_xapp python3-xapp
 python_xlib python3-xlib
@@ -1861,6 +1880,7 @@
 pywapi python3-pywapi
 pyxattr python3-pyxattr
 pyxdg python3-xdg
+pyzabbix python3-pyzabbix
 pyzmq python3-zmq
 pyzor pyzor
 q python3-q
@@ -1964,6 +1984,7 @@
 safeeyes safeeyes
 sagenb_export python3-sagenb-export
 sahara python3-sahara
+sahara_dashboard python3-sahara-dashboard
 salt salt-common
 salt_pepper salt-pepper
 sasmodels python3-sasmodels
@@ -2129,6 +2150,7 @@
 tabulate python3-tabulate
 tagpy python3-tagpy
 tap.py python3-tap
+tap_as_a_service python3-neutron-taas
 targetcli_fb targetcli-fb
 taskflow python3-taskflow
 taskw python3-taskw
@@ -2156,6 +2178,7 @@
 tinycss python3-tinycss
 tinyrpc python3-tinyrpc
 tkSnack python3-tksnack
+tldextract python3-tldextract
 tldp python3-tldp
 tldr.py tldr-py
 tlsh python3-tlsh
@@ -2186,6 +2209,8 @@
 treq python3-treq
 trezor python3-trezor
 trollius python3-trollius
+trove python3-trove
+trove_dashboard python3-trove-dashboard
 trydiffoscope trydiffoscope
 trytond tryton-server
 trytond_account tryton-modules-account
@@ -2414,6 +2439,7 @@
 yt python3-yt
 zake python3-zake
 zaqar python3-zaqar
+zaqar_ui python3-zaqar-ui
 zc.customdoctests python3-zc.customdoctests
 zeep python3-zeep
 zenoss python3-zenoss