diff -Nru python-cheroot-8.5.2+ds1/debian/changelog python-cheroot-8.5.2+ds1/debian/changelog
--- python-cheroot-8.5.2+ds1/debian/changelog	2022-03-17 14:21:05.000000000 +0000
+++ python-cheroot-8.5.2+ds1/debian/changelog	2022-07-20 21:11:06.000000000 +0000
@@ -1,3 +1,10 @@
+python-cheroot (8.5.2+ds1-1ubuntu4) UNRELEASED; urgency=medium
+
+  * d/p/pep440_version_number.patch: Cherry-pick Debian patch to produce
+    pep440 compliant versions (LP: #1967139).
+
+ -- Chris MacNaughton <chris.macnaughton@ubuntu.com>  Wed, 20 Jul 2022 21:11:06 +0000
+
 python-cheroot (8.5.2+ds1-1ubuntu3) jammy; urgency=medium
 
   * d/p/000*.patch: Cherry pick fixes from maint/8.x branch upstream
diff -Nru python-cheroot-8.5.2+ds1/debian/patches/0008-pep440_version_number.patch python-cheroot-8.5.2+ds1/debian/patches/0008-pep440_version_number.patch
--- python-cheroot-8.5.2+ds1/debian/patches/0008-pep440_version_number.patch	1970-01-01 00:00:00.000000000 +0000
+++ python-cheroot-8.5.2+ds1/debian/patches/0008-pep440_version_number.patch	2022-07-20 21:09:38.000000000 +0000
@@ -0,0 +1,16 @@
+Description: make the package return a PEP440-compatible version number
+Author: Julien Puydt
+Forwarded: Debian-specific
+Upstream: https://salsa.debian.org/python-team/packages/python-cheroot/-/commit/651023ab6d5a911747d6abd55655c2bbbd1b8c26
+
+--- python-cheroot.orig/cheroot/__init__.py
++++ python-cheroot/cheroot/__init__.py
+@@ -11,5 +11,7 @@
+ 
+ try:
+     __version__ = pkg_resources.get_distribution('cheroot').version
++    if __version__.find('+ds') != -1:
++        __version__ = __version__[:__version__.find('+ds')]
+ except Exception:
+     __version__ = 'unknown'
+
diff -Nru python-cheroot-8.5.2+ds1/debian/patches/series python-cheroot-8.5.2+ds1/debian/patches/series
--- python-cheroot-8.5.2+ds1/debian/patches/series	2022-03-17 14:15:20.000000000 +0000
+++ python-cheroot-8.5.2+ds1/debian/patches/series	2022-07-20 21:11:06.000000000 +0000
@@ -5,3 +5,4 @@
 0005-Expect-SSLEOFError-in-tests-on-Windows-as-well.patch
 0006-Ignore-unraisable-Python-3.10-exceptions-pytest.patch
 0007-Fix-test_broken_connection_during_tcp_fin-exc-flag.patch
+0008-pep440_version_number.patch