diff -pruN 16.0.0-1/debian/changelog 16.0.0-1ubuntu1/debian/changelog
--- 16.0.0-1/debian/changelog	2026-01-01 17:05:55.000000000 +0000
+++ 16.0.0-1ubuntu1/debian/changelog	2026-01-08 11:48:24.000000000 +0000
@@ -1,3 +1,10 @@
+python-pdoc (16.0.0-1ubuntu1) resolute; urgency=medium
+
+  * Restore patch to avoid six dependency in test_smoke,
+    still needed in Ubuntu for now
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Thu, 08 Jan 2026 11:48:24 +0000
+
 python-pdoc (16.0.0-1) unstable; urgency=medium
 
   * Team upload.
diff -pruN 16.0.0-1/debian/control 16.0.0-1ubuntu1/debian/control
--- 16.0.0-1/debian/control	2026-01-01 17:05:55.000000000 +0000
+++ 16.0.0-1ubuntu1/debian/control	2026-01-08 10:49:20.000000000 +0000
@@ -1,5 +1,6 @@
 Source: python-pdoc
-Maintainer: Debian Python Team <team+python@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Python Team <team+python@tracker.debian.org>
 Uploaders:
  Yogeswaran Umasankar <yogu@debian.org>,
 Homepage: https://github.com/mitmproxy/pdoc
diff -pruN 16.0.0-1/debian/patches/0001-Avoid-six-dependency-in-test_smoke.patch 16.0.0-1ubuntu1/debian/patches/0001-Avoid-six-dependency-in-test_smoke.patch
--- 16.0.0-1/debian/patches/0001-Avoid-six-dependency-in-test_smoke.patch	1970-01-01 00:00:00.000000000 +0000
+++ 16.0.0-1ubuntu1/debian/patches/0001-Avoid-six-dependency-in-test_smoke.patch	2025-03-25 10:30:18.000000000 +0000
@@ -0,0 +1,23 @@
+From: Joaquin Torres <joaquintorres@integra.cnea.gob.ar>
+Date: Sat, 19 Oct 2024 18:06:44 +0000
+Subject: Avoid six dependency in test_smoke.py
+Forwarded: not-needed
+As reported on https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1082245
+, upstream no longer uses tkinter.tix/six in their test environment.
+---
+ test/test_smoke.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_smoke.py b/test/test_smoke.py
+index 60f1041..31c93a1 100644
+--- a/test/test_smoke.py
++++ b/test/test_smoke.py
+@@ -11,7 +11,7 @@ import pdoc
+ modules = [
+     m.name
+     for m in pkgutil.iter_modules()
+-    if not m.name.startswith("_") and m.name not in ("test", "idlelib", "py")
++    if not m.name.startswith("_") and m.name not in ("test", "idlelib", "py", "six")
+ ] + ["unittest.mock"]
+ 
+ 
diff -pruN 16.0.0-1/debian/patches/series 16.0.0-1ubuntu1/debian/patches/series
--- 16.0.0-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 16.0.0-1ubuntu1/debian/patches/series	2026-01-08 10:47:22.000000000 +0000
@@ -0,0 +1 @@
+0001-Avoid-six-dependency-in-test_smoke.patch