diff -Nru restrictedpython-4.0~b3/debian/changelog restrictedpython-4.0~b3/debian/changelog
--- restrictedpython-4.0~b3/debian/changelog	2021-12-11 18:10:50.000000000 +0000
+++ restrictedpython-4.0~b3/debian/changelog	2021-12-22 12:59:13.000000000 +0000
@@ -1,9 +1,23 @@
-restrictedpython (4.0~b3-2ubuntu1) jammy; urgency=medium
+restrictedpython (4.0~b3-3) unstable; urgency=medium
 
-  * Set Restrictions: allow-stderr for the tests to allow them to pass in
-    the face of deprecation warnings with python 3.10.  Closes: #1001482.
+  [ Ondřej Nový ]
+  * d/control: Remove ancient X-Python3-Version field
+  * d/control: Update Maintainer field with new Debian Python Team
+    contact address.
+  * d/control: Update Vcs-* fields with new Debian Python Team Salsa
+    layout.
 
- -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 11 Dec 2021 18:10:50 +0000
+  [ Debian Janitor ]
+  * Use secure URI in Homepage field.
+  * Bump debhelper from old 11 to 12.
+
+  [ Christoph Berg ]
+  * d/tests: Use autodep8 test instead of the zope no-op one.
+    (Closes: #909487, #1001482)
+  * d/clean: Remove src/RestrictedPython.egg-info/, it's changing at
+    build-time.
+
+ -- Christoph Berg <myon@debian.org>  Wed, 22 Dec 2021 13:59:13 +0100
 
 restrictedpython (4.0~b3-2) unstable; urgency=medium
 
diff -Nru restrictedpython-4.0~b3/debian/clean restrictedpython-4.0~b3/debian/clean
--- restrictedpython-4.0~b3/debian/clean	1970-01-01 00:00:00.000000000 +0000
+++ restrictedpython-4.0~b3/debian/clean	2021-12-22 12:59:13.000000000 +0000
@@ -0,0 +1 @@
+src/RestrictedPython.egg-info/
diff -Nru restrictedpython-4.0~b3/debian/control restrictedpython-4.0~b3/debian/control
--- restrictedpython-4.0~b3/debian/control	2021-12-11 18:10:50.000000000 +0000
+++ restrictedpython-4.0~b3/debian/control	2021-12-22 12:56:39.000000000 +0000
@@ -1,12 +1,11 @@
 Source: restrictedpython
 Section: python
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
+Maintainer: Debian Python Team <team+python@tracker.debian.org>
 Uploaders:
  Christoph Berg <myon@debian.org>,
 Build-Depends:
- debhelper-compat (= 11),
+ debhelper-compat (= 12),
  dh-python,
  python3-all,
  python3-pytest,
@@ -14,10 +13,9 @@
  python3-setuptools,
 Standards-Version: 4.2.1
 Rules-Requires-Root: no
-X-Python3-Version: >= 3.2
-Vcs-Git: https://salsa.debian.org/python-team/modules/restrictedpython.git
-Vcs-Browser: https://salsa.debian.org/python-team/modules/restrictedpython
-Homepage: http://restrictedpython.readthedocs.io/en/latest/
+Vcs-Git: https://salsa.debian.org/python-team/packages/restrictedpython.git
+Vcs-Browser: https://salsa.debian.org/python-team/packages/restrictedpython
+Homepage: https://restrictedpython.readthedocs.io/en/latest/
 
 Package: python3-restrictedpython
 Architecture: all
diff -Nru restrictedpython-4.0~b3/debian/source/lintian-overrides restrictedpython-4.0~b3/debian/source/lintian-overrides
--- restrictedpython-4.0~b3/debian/source/lintian-overrides	2018-09-24 12:48:21.000000000 +0000
+++ restrictedpython-4.0~b3/debian/source/lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-# don't bug people uploading from @work
-source: changelog-should-mention-nmu
-source: source-nmu-has-incorrect-version-number
diff -Nru restrictedpython-4.0~b3/debian/tests/all restrictedpython-4.0~b3/debian/tests/all
--- restrictedpython-4.0~b3/debian/tests/all	2018-09-24 12:48:21.000000000 +0000
+++ restrictedpython-4.0~b3/debian/tests/all	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-testfilter="-s RestrictedPython"
-. /usr/share/python3-zope.testrunner/test_helper_3
diff -Nru restrictedpython-4.0~b3/debian/tests/control restrictedpython-4.0~b3/debian/tests/control
--- restrictedpython-4.0~b3/debian/tests/control	2021-12-11 18:10:24.000000000 +0000
+++ restrictedpython-4.0~b3/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-Tests: all
-Depends: @, python3-distutils, python3-zope.testrunner, python3-all
-Restrictions: allow-stderr
diff -Nru restrictedpython-4.0~b3/debian/tests/pkg-python/import-name restrictedpython-4.0~b3/debian/tests/pkg-python/import-name
--- restrictedpython-4.0~b3/debian/tests/pkg-python/import-name	1970-01-01 00:00:00.000000000 +0000
+++ restrictedpython-4.0~b3/debian/tests/pkg-python/import-name	2021-12-22 12:59:13.000000000 +0000
@@ -0,0 +1 @@
+RestrictedPython