diff -Nru mimerender-0.6.0/debian/changelog mimerender-0.6.0/debian/changelog
--- mimerender-0.6.0/debian/changelog	2016-09-22 12:07:12.000000000 +0000
+++ mimerender-0.6.0/debian/changelog	2019-07-27 00:39:38.000000000 +0000
@@ -1,3 +1,15 @@
+mimerender (0.6.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * d/control: Set Vcs-* to salsa.debian.org
+  * d/copyright: Use https protocol in Format field
+  * d/watch: Use https protocol
+  * Convert git repository from git-dpm to gbp layout
+  * Use debhelper-compat instead of debian/compat.
+  * Drop Python 2 support.
+
+ -- Ondřej Nový <onovy@debian.org>  Sat, 27 Jul 2019 02:39:38 +0200
+
 mimerender (0.6.0-1) unstable; urgency=low
 
   * Initial packaging of upstream release. (Closes: #838564)
diff -Nru mimerender-0.6.0/debian/compat mimerender-0.6.0/debian/compat
--- mimerender-0.6.0/debian/compat	2016-09-22 12:07:12.000000000 +0000
+++ mimerender-0.6.0/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-10
diff -Nru mimerender-0.6.0/debian/control mimerender-0.6.0/debian/control
--- mimerender-0.6.0/debian/control	2016-09-22 12:07:12.000000000 +0000
+++ mimerender-0.6.0/debian/control	2019-07-27 00:39:38.000000000 +0000
@@ -5,33 +5,15 @@
 Section: python
 Priority: optional
 Build-Depends:
- debhelper (>= 10),
+ debhelper-compat (= 10),
  dh-python,
- python-all (>= 2.6.6-3),
- python-setuptools (>= 0.6b3),
  python3-all,
  python3-setuptools,
 Standards-Version: 3.9.8
 Homepage: https://github.com/martinblech/mimerender
 Testsuite: autopkgtest-pkg-python
-Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/mimerender.git
-Vcs-Browser: https://anonscm.debian.org/git/python-modules/packages/mimerender.git
-
-Package: python-mimerender
-Architecture: all
-Depends:
- ${misc:Depends},
- ${python:Depends},
-Description: RESTful HTTP Content Negotiation for web frameworks (Python 2)
- mimerender provides a decorator that wraps an HTTP request handler to
- select the correct render function for a given HTTP Accept header. It
- uses mimeparse to parse the Accept string and select the best available
- representation.
- .
- mimerender supports Flask, Bottle, web.py and webapp2 out of the
- box, and it’s easy to add support for other frameworks.
- .
- This package contains the Python 2 module.
+Vcs-Git: https://salsa.debian.org/python-team/modules/mimerender.git
+Vcs-Browser: https://salsa.debian.org/python-team/modules/mimerender
 
 Package: python3-mimerender
 Architecture: all
diff -Nru mimerender-0.6.0/debian/copyright mimerender-0.6.0/debian/copyright
--- mimerender-0.6.0/debian/copyright	2016-09-22 12:07:12.000000000 +0000
+++ mimerender-0.6.0/debian/copyright	2019-07-27 00:39:38.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: mimerender
 Upstream-Contact: Martin Blech <martinblech@gmail.com>
 Source: https://github.com/martinblech/mimerender
diff -Nru mimerender-0.6.0/debian/.git-dpm mimerender-0.6.0/debian/.git-dpm
--- mimerender-0.6.0/debian/.git-dpm	2016-09-22 12:07:12.000000000 +0000
+++ mimerender-0.6.0/debian/.git-dpm	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-2cd7ea2dbc6b8f38a778722b253efc20772eb27c
-2cd7ea2dbc6b8f38a778722b253efc20772eb27c
-2cd7ea2dbc6b8f38a778722b253efc20772eb27c
-2cd7ea2dbc6b8f38a778722b253efc20772eb27c
-mimerender_0.6.0.orig.tar.gz
-49040fe377de9d6423883c554e3da96258592606
-5260
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff -Nru mimerender-0.6.0/debian/python-mimerender.lintian-overrides mimerender-0.6.0/debian/python-mimerender.lintian-overrides
--- mimerender-0.6.0/debian/python-mimerender.lintian-overrides	2016-09-22 12:07:12.000000000 +0000
+++ mimerender-0.6.0/debian/python-mimerender.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# Upstream does not provide a changelog.
-python-mimerender binary: no-upstream-changelog
diff -Nru mimerender-0.6.0/debian/rules mimerender-0.6.0/debian/rules
--- mimerender-0.6.0/debian/rules	2016-09-22 12:07:12.000000000 +0000
+++ mimerender-0.6.0/debian/rules	2019-07-27 00:39:38.000000000 +0000
@@ -4,4 +4,4 @@
 # Tue, 13 Sep 2016 12:50:39 +0200
 export PYBUILD_NAME=mimerender
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild
diff -Nru mimerender-0.6.0/debian/watch mimerender-0.6.0/debian/watch
--- mimerender-0.6.0/debian/watch	2016-09-22 12:07:12.000000000 +0000
+++ mimerender-0.6.0/debian/watch	2019-07-27 00:39:38.000000000 +0000
@@ -1,4 +1,4 @@
-# please also check http://pypi.debian.net/mimerender/watch
+# please also check https://pypi.debian.net/mimerender/watch
 version=3
 opts="uversionmangle=s/(rc|a|b|c)/~$1/" \
-http://pypi.debian.net/mimerender/mimerender-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+https://pypi.debian.net/mimerender/mimerender-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))