diff -Nru pyside2-5.15.2/debian/changelog pyside2-5.15.2/debian/changelog
--- pyside2-5.15.2/debian/changelog	2021-11-16 09:16:14.000000000 +0000
+++ pyside2-5.15.2/debian/changelog	2022-02-05 15:09:17.000000000 +0000
@@ -1,3 +1,22 @@
+pyside2 (5.15.2-2+rpi2) bookworm-staging; urgency=medium
+
+  * Add build-conflicts on libshiboken2-dev
+  * Improve replacement rules for paths
+    (still not ideal)
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 05 Feb 2022 15:09:17 +0000
+
+pyside2 (5.15.2-2+rpi1) bookworm-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-3+rpi1 by Peter Michael Green]
+  * Disable testsuite.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 24 Nov 2021 04:42:48 +0000
+
 pyside2 (5.15.2-2) unstable; urgency=medium
 
   * Backport upstream patches for Python 3.10 support (closes: #999369).
diff -Nru pyside2-5.15.2/debian/control pyside2-5.15.2/debian/control
--- pyside2-5.15.2/debian/control	2021-11-14 16:23:43.000000000 +0000
+++ pyside2-5.15.2/debian/control	2022-02-05 15:09:17.000000000 +0000
@@ -56,9 +56,11 @@
                qtquickcontrols2-5-dev (>= 5.15),
                qtscript5-dev (>= 5.15),
                qttools5-dev (>= 5.15),
-               qtwebengine5-dev (>= 5.15) [amd64 arm64 armhf i386 mipsel],
-               xauth,
-               xvfb
+               qtwebengine5-dev (>= 5.15) [amd64 arm64 i386 mipsel],
+               xvfb,
+               xauth
+Build-Conflicts:
+               libshiboken2-dev
 Rules-Requires-Root: no
 Standards-Version: 4.5.0
 Homepage: https://wiki.qt.io/Qt_for_Python
@@ -285,7 +287,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, python3-pyside2.qtnetwork
 Description: Python bindings for Qt5 WebEngineCore module (Python 3)
@@ -504,7 +506,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,
@@ -701,7 +703,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.15.2/debian/rules pyside2-5.15.2/debian/rules
--- pyside2-5.15.2/debian/rules	2021-11-15 19:16:04.000000000 +0000
+++ pyside2-5.15.2/debian/rules	2022-02-05 15:09:17.000000000 +0000
@@ -52,12 +52,19 @@
 	# 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
+	rm -f build_history/*/build_dir.txt
+
 override_dh_auto_test:
 ifeq (mips64el,$(DEB_HOST_ARCH))
 	# See https://bugs.debian.org/868745
-	QSG_NO_DEPTH_BUFFER=1 xvfb-run -a dh_auto_test -- --system=custom \
-		--test-args '{interpreter} testrunner.py test'
+	#QSG_NO_DEPTH_BUFFER=1 xvfb-run -a dh_auto_test -- --system=custom \
+	#	--test-args '{interpreter} testrunner.py test'
 else
-	xvfb-run -a dh_auto_test -- --system=custom \
-		--test-args '{interpreter} testrunner.py test'
+	#xvfb-run -a dh_auto_test -- --system=custom \
+	#	--test-args '{interpreter} testrunner.py test'
 endif
diff -Nru pyside2-5.15.2/debian/set-paths pyside2-5.15.2/debian/set-paths
--- pyside2-5.15.2/debian/set-paths	2021-11-14 16:01:38.000000000 +0000
+++ pyside2-5.15.2/debian/set-paths	2022-02-05 15:09:17.000000000 +0000
@@ -3,9 +3,9 @@
 # Replace build directory value by install directory value
 package="libshiboken2-dev"
 for directory in "cmake/Shiboken2-$MAIN_VERSION_UPSTREAM" "pkgconfig"; do
-        sed -i "s|build.*relwithdebinfo/lib|usr/lib/$DEB_HOST_MULTIARCH|" \
+        sed -i "s|$PWD.*relwithdebinfo/lib|/usr/lib/$DEB_HOST_MULTIARCH|" \
 	    debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
-        sed -i "s|build.*relwithdebinfo|usr|" \
+        sed -i "s|$PWD..*relwithdebinfo|/usr|" \
 	    debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;
         sed -i "s|\${PACKAGE_PREFIX_DIR}|/usr|" \
 	    debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*;