diff -Nru toro-1.0.1/debian/changelog toro-1.0.1/debian/changelog
--- toro-1.0.1/debian/changelog	2019-10-15 16:04:08.000000000 +0000
+++ toro-1.0.1/debian/changelog	2021-11-13 11:48:16.000000000 +0000
@@ -1,3 +1,15 @@
+toro (1.0.1-5) unstable; urgency=medium
+
+  * Added patch to remove use of use_2to3 (Closes: #997598)
+  * Added patch to fix test.
+  * debian/control:
+    + Updated Standards-Version to 4.6.0.1
+    + Added Rules-Requires-Root field.
+    + Updated to dh 13.
+  * Added debian/upstream/metadata file.
+
+ -- Kartik Mistry <kartik@debian.org>  Sat, 13 Nov 2021 17:18:16 +0530
+
 toro (1.0.1-4) unstable; urgency=low
 
   * Acknowledge NMU.
diff -Nru toro-1.0.1/debian/compat toro-1.0.1/debian/compat
--- toro-1.0.1/debian/compat	2019-10-15 16:03:35.000000000 +0000
+++ toro-1.0.1/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-12
diff -Nru toro-1.0.1/debian/control toro-1.0.1/debian/control
--- toro-1.0.1/debian/control	2019-10-15 16:04:02.000000000 +0000
+++ toro-1.0.1/debian/control	2021-11-13 11:24:07.000000000 +0000
@@ -2,11 +2,12 @@
 Maintainer: Kartik Mistry <kartik@debian.org>
 Section: python
 Priority: optional
-Build-Depends: debhelper (>= 12), dh-python, python3, python3-setuptools
-Standards-Version: 4.4.1
+Build-Depends: debhelper-compat (= 13), dh-python, python3, python3-setuptools
+Standards-Version: 4.6.0.1
 Vcs-Git: https://salsa.debian.org/debian/toro.git
 Vcs-Browser: https://salsa.debian.org/debian/toro
 Homepage: https://github.com/ajdavis/toro/
+Rules-Requires-Root: no
 
 Package: python3-toro
 Architecture: all
diff -Nru toro-1.0.1/debian/patches/module_name_fix.patch toro-1.0.1/debian/patches/module_name_fix.patch
--- toro-1.0.1/debian/patches/module_name_fix.patch	1970-01-01 00:00:00.000000000 +0000
+++ toro-1.0.1/debian/patches/module_name_fix.patch	2021-11-13 11:48:16.000000000 +0000
@@ -0,0 +1,25 @@
+Description: Rename module Queue to queue
+diff a/test/test_queue.py b/test/test_queue.py
+--- a/test/test_queue.py
++++ b/test/test_queue.py
+@@ -10,7 +10,7 @@ There are three sections, one each for tests that are
+ 
+ import time
+ from datetime import timedelta
+-from Queue import Empty, Full
++from queue import Empty, Full
+ 
+ from tornado import gen
+ from tornado.ioloop import IOLoop
+diff a/toro/__init__.py b/toro/__init__.py
+--- a/toro/__init__.py
++++ b/toro/__init__.py
+@@ -2,7 +2,7 @@ import contextlib
+ import heapq
+ import collections
+ from functools import partial
+-from Queue import Full, Empty
++from queue import Full, Empty
+ 
+ import tornado
+ from tornado import ioloop
diff -Nru toro-1.0.1/debian/patches/series toro-1.0.1/debian/patches/series
--- toro-1.0.1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ toro-1.0.1/debian/patches/series	2021-11-13 11:24:07.000000000 +0000
@@ -0,0 +1,2 @@
+setuptools_fix.patch
+module_name_fix.patch
diff -Nru toro-1.0.1/debian/patches/setuptools_fix.patch toro-1.0.1/debian/patches/setuptools_fix.patch
--- toro-1.0.1/debian/patches/setuptools_fix.patch	1970-01-01 00:00:00.000000000 +0000
+++ toro-1.0.1/debian/patches/setuptools_fix.patch	2021-11-13 11:24:07.000000000 +0000
@@ -0,0 +1,24 @@
+Description: Remove use of use_2to3
+diff --git a/setup.py b/setup.py
+index 92d0b39..5bce468 100644
+--- a/setup.py
++++ b/setup.py
+@@ -40,10 +40,6 @@ long_description = open("README.rst").read()
+ 
+ major, minor = sys.version_info[:2]
+ 
+-kwargs = {}
+-if major >= 3:
+-    kwargs['use_2to3'] = True
+-
+ packages = ['toro']
+ if "test" in sys.argv:
+     packages.append('test')
+@@ -60,6 +56,5 @@ setup(name='toro',
+       license='http://www.apache.org/licenses/LICENSE-2.0',
+       classifiers=filter(None, classifiers.split('\n')),
+       keywords='tornado coroutines semaphore mutex queue asynchronous',
+-      test_suite='test',
+-      **kwargs
++      test_suite='test'
+ )
diff -Nru toro-1.0.1/debian/upstream/metadata toro-1.0.1/debian/upstream/metadata
--- toro-1.0.1/debian/upstream/metadata	1970-01-01 00:00:00.000000000 +0000
+++ toro-1.0.1/debian/upstream/metadata	2021-11-13 11:48:05.000000000 +0000
@@ -0,0 +1,7 @@
+---
+Archive: GitHub
+Bug-Database: https://github.com/ajdavis/toro/issues
+Bug-Submit: https://github.com/ajdavis/toro/issues/new
+Changelog: https://github.com/ajdavis/toro/tags
+Repository: https://github.com/ajdavis/toro.git
+Repository-Browse: https://github.com/ajdavis/toro