diff -Nru tvdb-api-2.0/debian/changelog tvdb-api-2.0/debian/changelog
--- tvdb-api-2.0/debian/changelog	2018-06-11 01:44:23.000000000 +0000
+++ tvdb-api-2.0/debian/changelog	2019-08-18 15:42:50.000000000 +0000
@@ -1,3 +1,19 @@
+tvdb-api (2.0-2) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * Convert git repository from git-dpm to gbp layout
+  * Use debhelper-compat instead of debian/compat.
+
+  [ Sandro Tosi ]
+  * drop Python 2 support + use pybuild + skip tests
+  * debian/control
+    - bump Standards-Version to 4.4.0 (no changes needed)
+    - drop obsolete XS-Python-Version field
+  * debian/copyright
+    - extend packaging copyright years
+
+ -- Sandro Tosi <morph@debian.org>  Sun, 18 Aug 2019 11:42:50 -0400
+
 tvdb-api (2.0-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff -Nru tvdb-api-2.0/debian/compat tvdb-api-2.0/debian/compat
--- tvdb-api-2.0/debian/compat	2018-06-11 01:44:23.000000000 +0000
+++ tvdb-api-2.0/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-9
diff -Nru tvdb-api-2.0/debian/control tvdb-api-2.0/debian/control
--- tvdb-api-2.0/debian/control	2018-06-11 01:44:23.000000000 +0000
+++ tvdb-api-2.0/debian/control	2019-08-18 15:42:50.000000000 +0000
@@ -3,23 +3,14 @@
 Priority: optional
 Maintainer: Sandro Tosi <morph@debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9), python-all, dh-python, python-setuptools, python3, python3-setuptools
-XS-Python-Version: all
-Standards-Version: 4.1.4
+Build-Depends: debhelper-compat (= 9), dh-python, python3, python3-setuptools
+Standards-Version: 4.4.0
 Homepage: https://github.com/dbr/tvdb_api
 Vcs-Git: https://salsa.debian.org/python-team/modules/tvdb-api.git
 Vcs-Browser: https://salsa.debian.org/python-team/modules/tvdb-api
 
-Package: python-tvdb-api
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
-Description: API interface to TheTVDB.com
- An easy to use API interface to TheTVDB.com .
-
 Package: python3-tvdb-api
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends}, python3-requests, python3-requests-cache
 Description: API interface to TheTVDB.com (Python 3)
  An easy to use API interface to TheTVDB.com .
- .
- This is the Python 3 package for tvdb_api.
diff -Nru tvdb-api-2.0/debian/copyright tvdb-api-2.0/debian/copyright
--- tvdb-api-2.0/debian/copyright	2018-06-11 01:44:23.000000000 +0000
+++ tvdb-api-2.0/debian/copyright	2019-08-18 15:42:50.000000000 +0000
@@ -31,7 +31,7 @@
  For more information, please refer to <http://unlicense.org/>
 
 Files: debian/*
-Copyright: 2012-2018 Sandro Tosi <morph@debian.org>
+Copyright: 2012-2019 Sandro Tosi <morph@debian.org>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -61,4 +61,3 @@
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU Lesser General Public License for more details.
-
diff -Nru tvdb-api-2.0/debian/.git-dpm tvdb-api-2.0/debian/.git-dpm
--- tvdb-api-2.0/debian/.git-dpm	2018-06-11 01:44:23.000000000 +0000
+++ tvdb-api-2.0/debian/.git-dpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-4b1089dac1e5136587460f1d0cb1834b4ae061d3
-4b1089dac1e5136587460f1d0cb1834b4ae061d3
-4b1089dac1e5136587460f1d0cb1834b4ae061d3
-4b1089dac1e5136587460f1d0cb1834b4ae061d3
-tvdb-api_1.10.orig.tar.gz
-7104ad73e760b653c347c95d84625f8d22548950
-34630
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff -Nru tvdb-api-2.0/debian/rules tvdb-api-2.0/debian/rules
--- tvdb-api-2.0/debian/rules	2018-06-11 01:44:23.000000000 +0000
+++ tvdb-api-2.0/debian/rules	2019-08-18 15:42:50.000000000 +0000
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 
+export PYBUILD_DISABLE=test
+
 %:
-	dh $@ --with python2,python3
+	dh $@ --with python3 --buildsystem=pybuild
 
 
 override_dh_clean:
@@ -11,7 +13,6 @@
 override_dh_auto_install:
 	dh_auto_install
 
-	python setup.py install --root=debian/python-tvdb-api --install-layout=deb
 	python3 setup.py install --root=debian/python3-tvdb-api --install-layout=deb
 
 	rm -rf debian/*/usr/lib/python*/*-packages/tvdb_api*.egg-info