diff -Nru dbus-python-1.2.0/debian/changelog dbus-python-1.2.0/debian/changelog
--- dbus-python-1.2.0/debian/changelog	2022-09-30 20:48:06.000000000 +0000
+++ dbus-python-1.2.0/debian/changelog	2022-10-01 03:44:49.000000000 +0000
@@ -1,3 +1,12 @@
+dbus-python (1.2.0-3+16.04.sav1) xenial; urgency=medium
+
+  * Build python-dbus-dev package to add missing libdbus-1-dev PD:
+    - debian/control: Restore Python 2 BDs and python-dbus-dev package
+      - Add missing libdbus-1-dev PD to python-dbus-dev package
+    - debian/rules: Restore all arch-indep (for dev package) code
+
+ -- Rob Savoury <savoury@savos.tech>  Fri, 30 Sep 2022 20:44:49 -0700
+
 dbus-python (1.2.0-3+16.04.sav0) xenial; urgency=medium
 
   * Rebuild for Python 3.6 PPA (ppa:savoury1/python-defaults-3.6)
@@ -7,13 +16,11 @@
       - Change python3-dbus.mainloop.qt -> python3-dbus.mainloop.pyqt6 package
         for Recommends in python3.6-dbus for Qt 6 specific version
     - debian/python3-dbus.*: Rename to python3.6-dbus.* for unique packages
-    - debian/python3.6-dbus-dbg.install: Change python3 -> python3.6 for dest
     - debian/rules: Add override_dh_python3, set /usr/bin/python3.6 shebang
       - Add {DEFAULT,INSTALL}DIR variables and after dh_python3 call move
         default install and dbg directories to correct /usr/lib/python3.6 path
       - Remove all Python 2 and dev/doc package related code
       - Change python3 -> python3.6 for various dh_* invocations
-      - In override_dh_auto_install-arch change all /python3/ -> /python3.6/
     - debian/python3.6-dbus.{postinst,prerm}: Create, include snippets for
       py3{compile,clean} modified to use -V 3.6 option for correct version
 
diff -Nru dbus-python-1.2.0/debian/control dbus-python-1.2.0/debian/control
--- dbus-python-1.2.0/debian/control	2022-09-30 20:15:01.000000000 +0000
+++ dbus-python-1.2.0/debian/control	2022-10-01 03:41:33.000000000 +0000
@@ -12,9 +12,9 @@
                dh-autoreconf,
                dh-python,
                dpkg-dev (>= 1.16.1),
-#               python-all-dbg (>= 2.6.6-3~),
-#               python-all-dev (>= 2.6.6-3~),
-#               python-gi,
+               python-all-dbg (>= 2.6.6-3~),
+               python-all-dev (>= 2.6.6-3~),
+               python-gi,
                python3-all-dbg,
                python3-all-dev,
 #               python3-gi,
@@ -72,24 +72,25 @@
  .
  See the dbus description for more information about D-Bus in general.
 
-#Package: python-dbus-dev
-#Section: python
-#Architecture: all
-#Depends: ${misc:Depends}
-#Breaks: python-dbus (<< 1.0),
-#        python-dbus-common (<< 1.0)
-#Replaces: python-dbus (<< 1.0),
-#          python-dbus-common (<< 1.0)
-#Description: main loop integration development files for python-dbus
-# D-Bus is a message bus, used for sending messages between applications.
-# Conceptually, it fits somewhere in between raw sockets and CORBA in
-# terms of complexity.
-# .
-# This package provides development files required to compile main-loop
-# integration modules for python-dbus, such as dbus.mainloop.pyqt5 provided
-# by PyQt. It is Python-version-independent: packages that build-depend
-# on python-dbus-dev should also build-depend on python-dbus,
-# python3-dbus, python-dbus-dbg and/or python3-dbus-dbg.
+Package: python-dbus-dev
+Section: python
+Architecture: all
+Depends: libdbus-1-dev (>= 1.6),
+         ${misc:Depends}
+Breaks: python-dbus (<< 1.0),
+        python-dbus-common (<< 1.0)
+Replaces: python-dbus (<< 1.0),
+          python-dbus-common (<< 1.0)
+Description: main loop integration development files for python-dbus
+ D-Bus is a message bus, used for sending messages between applications.
+ Conceptually, it fits somewhere in between raw sockets and CORBA in
+ terms of complexity.
+ .
+ This package provides development files required to compile main-loop
+ integration modules for python-dbus, such as dbus.mainloop.pyqt5 provided
+ by PyQt. It is Python-version-independent: packages that build-depend
+ on python-dbus-dev should also build-depend on python-dbus,
+ python3-dbus, python-dbus-dbg and/or python3-dbus-dbg.
 
 #Package: python-dbus-dbg
 #Section: debug
diff -Nru dbus-python-1.2.0/debian/rules dbus-python-1.2.0/debian/rules
--- dbus-python-1.2.0/debian/rules	2022-09-30 19:53:01.000000000 +0000
+++ dbus-python-1.2.0/debian/rules	2022-10-01 03:42:11.000000000 +0000
@@ -31,21 +31,21 @@
 			--libdir=/usr/lib \
 			; \
 	done
-#override_dh_auto_configure-indep:
-#	dh_auto_configure \
-#		--builddirectory=build-indep \
-#		-- \
-#		--libdir=/usr/lib \
-#		--docdir=/usr/share/doc/python-dbus-doc \
-#		${NULL}
+override_dh_auto_configure-indep:
+	dh_auto_configure \
+		--builddirectory=build-indep \
+		-- \
+		--libdir=/usr/lib \
+		--docdir=/usr/share/doc/python-dbus-doc \
+		${NULL}
 
 override_dh_auto_build-arch:
 	set -e && for x in $(FLAVOURS); do \
 		PYTHON=/usr/bin/python$$x \
 		dh_auto_build --arch --builddirectory=build-$$x; \
 	done
-#override_dh_auto_build-indep:
-#	dh_auto_build --indep --builddirectory=build-indep
+override_dh_auto_build-indep:
+	dh_auto_build --indep --builddirectory=build-indep
 
 override_dh_auto_test-arch:
 	:
@@ -113,8 +113,8 @@
 	done
 
 # do not install any docs, we copy those from the builddir
-#override_dh_auto_install-indep:
-#	make -C build-indep install-data DESTDIR=$(CURDIR)/debian/tmp
+override_dh_auto_install-indep:
+	make -C build-indep install-data DESTDIR=$(CURDIR)/debian/tmp
 
 override_dh_install:
 	rm -fr debian/tmp/usr/share/doc/dbus-python