diff -Nru pyside2-5.13.2/debian/changelog pyside2-5.13.2/debian/changelog
--- pyside2-5.13.2/debian/changelog	2020-05-18 01:27:01.000000000 +0000
+++ pyside2-5.13.2/debian/changelog	2020-05-25 21:09:28.000000000 +0000
@@ -1,3 +1,18 @@
+pyside2 (5.13.2-3+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 5.11.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 23 Dec 2018 23:25:45 +0000]
+  * Remove armhf from qtwebengine architecture lists.
+  * Fix clean target.
+
+  [changes introduced in 5.13.2-2.2+rpi1 by Peter Michael Green]
+  * Replace 64 with ?? in debian/shiboken2-doc.docs to fix arch all build
+    on 32-bit architectures.
+
+  [changes introduced in 5.13.2-3+rpi1 by Peter Michael Green]
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 25 May 2020 21:09:28 +0000
+
 pyside2 (5.13.2-3) unstable; urgency=medium
 
   * Add patches for Python 3.8 (Closes: #950129)
diff -Nru pyside2-5.13.2/debian/control pyside2-5.13.2/debian/control
--- pyside2-5.13.2/debian/control	2020-05-18 01:27:01.000000000 +0000
+++ pyside2-5.13.2/debian/control	2020-05-25 21:09:28.000000000 +0000
@@ -49,8 +49,7 @@
                qtpositioning5-dev,
                qtscript5-dev,
                qttools5-dev,
-               qtwebengine5-dev [amd64 arm64 armhf i386 mipsel],
-#for tests
+               qtwebengine5-dev [amd64 arm64 i386 mipsel],
                python3-distro,
 	       qml-module-qtquick2,
 	       qml-module-qtquick-layouts,
@@ -268,7 +267,7 @@
  This package contains Python 3 bindings for the QtQml module.
 
 Package: python3-pyside2.qtwebenginecore
-Architecture: amd64 arm64 armhf i386 mipsel
+Architecture: amd64 arm64 i386 mipsel
 Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends},
  python3-pyside2.qtcore
 Description: Python bindings for Qt5 WebEngineCore module (Python 3)
@@ -475,7 +474,7 @@
  This package contains Python 3 bindings for the QtTest module.
 
 Package: python3-pyside2.qtwebenginewidgets
-Architecture: amd64 arm64 armhf i386 mipsel
+Architecture: amd64 arm64 i386 mipsel
 Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends},
  python3-pyside2.qtcore, python3-pyside2.qtgui, python3-pyside2.qtwidgets,
  python3-pyside2.qtnetwork, python3-pyside2.qtwebchannel,
@@ -646,7 +645,7 @@
  This package contains Python 3 bindings for the Scxml module.
 
 Package: python3-pyside2.qtwebengine
-Architecture: amd64 arm64 armhf i386 mipsel
+Architecture: amd64 arm64 i386 mipsel
 Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends},
  python3-pyside2.qtcore
 Description: Python bindings for Qt5 Web Engine (Python 3)
diff -Nru pyside2-5.13.2/debian/rules pyside2-5.13.2/debian/rules
--- pyside2-5.13.2/debian/rules	2020-05-18 01:27:01.000000000 +0000
+++ pyside2-5.13.2/debian/rules	2020-05-25 21:09:28.000000000 +0000
@@ -57,5 +57,11 @@
 	# not what we need
 	debian/set-paths
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf pyside_package pyside?_build pyside?_install
+	rm -f sources/pyside2/doc/qtmodules/*.qdocconf sources/pyside2/doc/pyside-config.qdocconf sources/pyside2/doc/pyside.qdocconf.in
+	find . -name *.qdoconf -delete
+
 override_dh_auto_test:
-	xvfb-run python3 testrunner.py test
+	#xvfb-run python3 testrunner.py test
diff -Nru pyside2-5.13.2/debian/shiboken2-doc.docs pyside2-5.13.2/debian/shiboken2-doc.docs
--- pyside2-5.13.2/debian/shiboken2-doc.docs	2020-05-18 01:27:01.000000000 +0000
+++ pyside2-5.13.2/debian/shiboken2-doc.docs	2020-05-25 21:09:28.000000000 +0000
@@ -1 +1 @@
-pyside3_build/py3.8-qt5.12.5-64bit-relwithdebinfo/shiboken2/doc/html
+pyside3_build/py3.8-qt5.12.5-??bit-relwithdebinfo/shiboken2/doc/html