diff -Nru pyside2-5.11.0/debian/changelog pyside2-5.11.0/debian/changelog
--- pyside2-5.11.0/debian/changelog	2018-07-31 14:37:40.000000000 +0000
+++ pyside2-5.11.0/debian/changelog	2018-07-31 19:33:04.000000000 +0000
@@ -1,3 +1,10 @@
+pyside2 (5.11.0-3) unstable; urgency=medium
+
+  * More fixes for builds building only arch any or only arch all.
+  * Really fix the build with dpkg-buildpackage -A.
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Tue, 31 Jul 2018 21:33:04 +0200
+
 pyside2 (5.11.0-2) unstable; urgency=medium
 
   [ Raphaël Hertzog ]
diff -Nru pyside2-5.11.0/debian/rules pyside2-5.11.0/debian/rules
--- pyside2-5.11.0/debian/rules	2018-07-31 14:37:40.000000000 +0000
+++ pyside2-5.11.0/debian/rules	2018-07-31 19:33:04.000000000 +0000
@@ -4,7 +4,7 @@
 
 # Safety measure to ensure package names match SONAMEs
 PYSIDE_MAJOR := $(shell echo $(DEB_VERSION_UPSTREAM) | cut -d. -f1-2)
-ifeq ($(shell dh_listpackages -a | grep -- -$(PYSIDE_MAJOR)$$),)
+ifeq ($(shell awk '/Package:/ {print $$2}' debian/control | grep -- -$(PYSIDE_MAJOR)$$),)
     $(error Please update package names for major version $(PYSIDE_MAJOR))
 endif
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -38,14 +38,17 @@
 override_dh_makeshlibs:
 	dh_makeshlibs -VUpstream-Version
 
-override_dh_install:
+override_dh_install-indep:
 	dh_install -X.doctrees
-	#remove RUNPATH setup in shiboken2
-	chrpath -d debian/shiboken2/usr/bin/shiboken2
 	# drop specific Python2 or Python code in packages. Otherwise it
 	# will fail during the packages installation
 	rm -r debian/python-pyside2uic/usr/lib/python2.7/dist-packages/pyside2uic/port_v3
 	rm -r debian/python3-pyside2uic/usr/lib/python3/dist-packages/pyside2uic/port_v2
+
+override_dh_install-arch:
+	dh_install
+	# remove RUNPATH setup in shiboken2
+	chrpath -d debian/shiboken2/usr/bin/shiboken2
 	# change the library path in pkg-info/*.pc and in *.cmake files:
 	# during the build the path is setup to the build dir
 	# /build/pyside2* (required to find lib during the build) but it's