diff -Nru python-pyftpdlib-1.5.4/debian/changelog python-pyftpdlib-1.5.4/debian/changelog
--- python-pyftpdlib-1.5.4/debian/changelog	2018-10-25 22:33:42.000000000 +0000
+++ python-pyftpdlib-1.5.4/debian/changelog	2019-12-17 12:53:16.000000000 +0000
@@ -1,3 +1,19 @@
+python-pyftpdlib (1.5.4-2build1) focal; urgency=medium
+
+  * No-change rebuild to generate dependencies on python2.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 17 Dec 2019 12:53:16 +0000
+
+python-pyftpdlib (1.5.4-2) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * Use debhelper-compat instead of debian/compat.
+
+  [ Sandro Tosi ]
+  * Drop python2 support; Closes: #938065
+
+ -- Sandro Tosi <morph@debian.org>  Fri, 13 Dec 2019 13:28:46 -0500
+
 python-pyftpdlib (1.5.4-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff -Nru python-pyftpdlib-1.5.4/debian/compat python-pyftpdlib-1.5.4/debian/compat
--- python-pyftpdlib-1.5.4/debian/compat	2018-10-25 21:07:48.000000000 +0000
+++ python-pyftpdlib-1.5.4/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru python-pyftpdlib-1.5.4/debian/control python-pyftpdlib-1.5.4/debian/control
--- python-pyftpdlib-1.5.4/debian/control	2018-10-25 21:13:50.000000000 +0000
+++ python-pyftpdlib-1.5.4/debian/control	2019-12-13 18:28:46.000000000 +0000
@@ -3,23 +3,16 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: W. Martin Borgert <debacle@debian.org>
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 11),
                dh-python,
-               python-all (>= 2.6.6-3~),
                python3-all,
-               python-mock,
                python3-mock,
-               python-openssl,
                python3-openssl,
-               python-psutil,
                python3-psutil,
-               python-sendfile (>= 2.0.0),
                python3-sendfile (>= 2.0.0),
-               python-setuptools (>= 0.6b3),
                python3-setuptools,
 	       python3-sphinx,
 	       python3-sphinx-rtd-theme,
-               python-unittest2,
                python3-unittest2,
 Standards-Version: 4.1.3
 Rules-Requires-Root: no
@@ -27,21 +20,6 @@
 Vcs-Git: https://salsa.debian.org/python-team/modules/python-pyftpdlib.git
 Vcs-Browser: https://salsa.debian.org/python-team/modules/python-pyftpdlib
 
-Package: python-pyftpdlib
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
-Recommends: python-sendfile (>= 2.0.0)
-Provides: ${python:Provides}
-Description: Python FTP server library (Python 2)
- Python FTP server library provides a high-level portable interface to
- easily write asynchronous FTP servers with Python.
- .
- pyftpdlib is currently the most complete RFC-959 FTP server
- implementation available for Python programming language. It is used
- in projects like Google Chromium and Bazaar.
- .
- This package provides the Python 2.x module.
-
 Package: python3-pyftpdlib
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
diff -Nru python-pyftpdlib-1.5.4/debian/python-pyftpdlib.docs python-pyftpdlib-1.5.4/debian/python-pyftpdlib.docs
--- python-pyftpdlib-1.5.4/debian/python-pyftpdlib.docs	2018-10-25 21:07:48.000000000 +0000
+++ python-pyftpdlib-1.5.4/debian/python-pyftpdlib.docs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-CREDITS
-README.rst
diff -Nru python-pyftpdlib-1.5.4/debian/python-pyftpdlib.examples python-pyftpdlib-1.5.4/debian/python-pyftpdlib.examples
--- python-pyftpdlib-1.5.4/debian/python-pyftpdlib.examples	2018-10-25 21:07:48.000000000 +0000
+++ python-pyftpdlib-1.5.4/debian/python-pyftpdlib.examples	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-demo
diff -Nru python-pyftpdlib-1.5.4/debian/rules python-pyftpdlib-1.5.4/debian/rules
--- python-pyftpdlib-1.5.4/debian/rules	2018-10-25 21:07:48.000000000 +0000
+++ python-pyftpdlib-1.5.4/debian/rules	2019-12-13 18:28:46.000000000 +0000
@@ -3,21 +3,14 @@
 export PYBUILD_NAME=pyftpdlib
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_test:
 ifeq "$(filter nocheck,$(DEB_BUILD_OPTIONS))" ""
 	EXCLUDETESTS="test_functional.py test_functional_ssl.py" \
-	PYTHONPATH=. TRAVIS=1 python pyftpdlib/test/runner.py
-	EXCLUDETESTS="test_functional.py test_functional_ssl.py" \
 	PYTHONPATH=. TRAVIS=1 python3 pyftpdlib/test/runner.py
 endif
 
-override_dh_python2:
-	dh_python2 -O--buildsystem=pybuild
-	rm -f ./debian/python-pyftpdlib/usr/bin/ftpbench \
-	rm -rf ./debian/python-pyftpdlib/usr/lib/python2.7/dist-packages/pyftpdlib/test/
-
 override_dh_python3:
 	dh_python3 -O--buildsystem=pybuild
 	rm -f ./debian/python3-pyftpdlib/usr/bin/ftpbench