diff -Nru python-pbr-5.1.3/debian/changelog python-pbr-5.1.3/debian/changelog
--- python-pbr-5.1.3/debian/changelog	2019-08-14 12:46:56.000000000 +0000
+++ python-pbr-5.1.3/debian/changelog	2019-08-18 13:23:24.000000000 +0000
@@ -1,3 +1,10 @@
+python-pbr (5.1.3-4+rpi1) bullseye-staging; urgency=medium
+
+  * Restore python 2 support for now.
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 18 Aug 2019 13:23:24 +0000
+
 python-pbr (5.1.3-4) unstable; urgency=medium
 
   * Team upload.
diff -Nru python-pbr-5.1.3/debian/control python-pbr-5.1.3/debian/control
--- python-pbr-5.1.3/debian/control	2019-08-14 12:45:56.000000000 +0000
+++ python-pbr-5.1.3/debian/control	2019-08-18 13:23:24.000000000 +0000
@@ -11,31 +11,84 @@
  git,
  gnupg,
  openstack-pkg-tools,
+ python-all,
+ python-setuptools,
+ python-sphinx,
  python3-all,
  python3-setuptools,
  python3-sphinx,
 Build-Depends-Indep:
+ python-all-dev <!nocheck>,
+ python-coverage <!nocheck>,
+ python-fixtures <!nocheck>,
+ python-markupsafe <!nocheck>,
+ python-mock <!nocheck>,
+ python-pip <!nocheck>,
+ python-six <!nocheck>,
+ python-testresources (>= 2.0.0) <!nocheck>,
+ python-testscenarios <!nocheck>,
+ python-testtools (>= 2.2.0) <!nocheck>,
+ python-virtualenv <!nocheck>,
+ python-wheel <!nocheck>,
  python3-all-dev <!nocheck>,
- python3-coverage <!nocheck>,
  python3-fixtures <!nocheck>,
  python3-markupsafe <!nocheck>,
  python3-mock <!nocheck>,
- python3-openstackdocstheme <!nocheck>,
+ python3-openstackdocstheme (>= 1.18.1) <!nocheck>,
  python3-pip <!nocheck>,
  python3-six <!nocheck>,
  python3-stestr <!nocheck>,
- python3-testresources <!nocheck>,
+ python3-testresources (>= 2.0.0) <!nocheck>,
  python3-testscenarios <!nocheck>,
- python3-testtools <!nocheck>,
+ python3-testtools (>= 2.2.0) <!nocheck>,
  python3-virtualenv <!nocheck>,
  python3-wheel <!nocheck>,
  subunit <!nocheck>,
+ testrepository <!nocheck>,
 Standards-Version: 4.4.0
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-pbr
 Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-pbr.git
 Homepage: https://pypi.python.org/pypi/pbr
 
+Package: python-pbr
+Architecture: all
+Depends:
+ python-pkg-resources,
+ python-setuptools,
+ python-six,
+ ${misc:Depends},
+ ${python:Depends},
+Recommends:
+ ${python:Recommends},
+Description: inject useful and sensible default behaviors into setuptools - Python 2.x
+ PBR (Python Build Reasonableness) is a library that injects some useful and
+ sensible default behaviors into your setuptools run. PBR can:
+  * Manage version number based on git revisions and tags (Version file).
+  * Generate AUTHORS file from git log
+  * Generate ChangeLog from git log
+  * Generate Sphinx autodoc stub files for your whole module
+  * Store your dependencies in a pip requirements file
+  * Use your README file as a long_description
+  * Smartly find packages under your root package
+ .
+ PBR is only mildly configurable. The basic idea is that there's a decent way
+ to run things and if you do, you should reap the rewards, because then it's
+ simple and repeatable. If you want to do things differently, cool! But you've
+ already got the power of Python at your fingertips, so you don't really need
+ PBR.
+ .
+ PBR builds on top of the work that d2to1 started to provide for declarative
+ configuration. d2to1 is itself an implementation of the ideas behind
+ distutils2. Although distutils2 is now abandoned in favor of work towards PEP
+ 426 and Metadata 2.0, declarative config is still a great idea and
+ specifically important in trying to distribute setup code as a library when
+ that library itself will alter how the setup is processed. As Metadata 2.0 and
+ other modern Python packaging PEPs come out, PBR aims to support them as
+ quickly as possible.
+ .
+ This package provides support for Python 2.x.
+
 Package: python-pbr-doc
 Section: doc
 Architecture: all
diff -Nru python-pbr-5.1.3/debian/rules python-pbr-5.1.3/debian/rules
--- python-pbr-5.1.3/debian/rules	2019-08-14 12:45:56.000000000 +0000
+++ python-pbr-5.1.3/debian/rules	2019-08-18 13:23:24.000000000 +0000
@@ -7,27 +7,26 @@
 export https_proxy=127.0.0.1:9
 
 %:
-	dh $@ --buildsystem=python_distutils --with python3,sphinxdoc
+	dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc
 
-override_dh_auto_clean:
-	rm -rf .stestr build __pycache__
-
-override_dh_auto_build:
-	echo "Do nothing..."
+override_dh_clean:
+	dh_clean -O--buildsystem=python_distutils
+	rm -rf .testrepository build __pycache__
+	rm -rf .stestr
 
 override_dh_auto_install:
-	pkgos-dh_auto_install --no-py2
+	pkgos-dh_auto_install
+
+override_dh_python3:
+	dh_python3 --shebang=/usr/bin/python3
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	pkgos-dh_auto_test --no-py2 'pbr\.tests(?!.*test_packaging\.TestRequirementParsing\.test_requirement_parsing.*)'
+	#pkgos-dh_auto_test 'pbr\.tests(?!.*test_packaging\.TestRequirementParsing\.test_requirement_parsing.*)'
 endif
 
 override_dh_sphinxdoc:
-ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 	PYTHONPATH=. PYTHON=python3 python3 -m sphinx -b html doc/source $(CURDIR)/debian/python-pbr-doc/usr/share/doc/python-pbr-doc/html
-	dh_sphinxdoc
+	dh_sphinxdoc -O--buildsystem=python_distutils
 endif
-
-override_dh_python3:
-	dh_python3 --shebang=/usr/bin/python3