Merge version 5.15.0-6+rpi1 and 5.15.2-1 to produce 5.15.2-1+rpi1

diff --cc debian/changelog
index 6c55b438729d1bc222afcd9eab5a5fbe1dde9c87,2e59bb761c2e6ef9347848fca9fe3d57b01ce76a..f9d1003d1a32d773b3803fda4cec1492babb33a7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,43 +1,54 @@@
- pyside2 (5.15.0-6+rpi1) bullseye-staging; urgency=medium
++pyside2 (5.15.2-1+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-3+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Dec 2020 18:57:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Jan 2021 14:16:24 +0000
++
+ pyside2 (5.15.2-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * Add missing dependencies to make the autopkgtest pass again.
+   * Backport proposed upstream patch to fix qApp flags handling.
+     - Unblacklist QtWidgets::bug_307 test, it should not fail anymore.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 26 Dec 2020 11:39:45 +0300
+ 
+ pyside2 (5.15.2-1~exp2) experimental; urgency=medium
+ 
+   * Add packages for Qt3DExtras and Qt3DAnimation
+   * Add update-sip-import.patch (Closes: #966041)
+ 
+  -- Kurt Kremitzki <kkremitzki@debian.org>  Sun, 20 Dec 2020 11:32:30 -0600
+ 
+ pyside2 (5.15.2-1~exp1) experimental; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * New upstream release.
+   * Drop python3.9.patch, included in the new release.
+   * Rebase other patches.
+   * Backport upstream changes to pass --reuse-build only to commands that
+     support it.
+   * Build with system patchelf on all architectures. It is now available on
+     mipsel and mips64el too.
+     - Drop update-patchelf.patch, not needed with system patchelf.
+   * Continue building HTML documentation (upstream defaults to qch now).
+   * Replace Qt Quick Controls 1 build-dependency with Qt Quick Controls 2.
+   * Build with default llvm version (closes: #974784).
+   * Revert addition of “Multi-Arch: same” from the previous upload.
+     libpyside2-py3-5.15 is not multi-arch ready because the list of built
+     modules (in _config.py) may be different on different architectures.
+   * Bump Qt build-dependencies to 5.15 (as ftbfs-old-qt.patch was dropped).
+   * Minor debian/rules cleanup.
+ 
+   [ Alexander Volkov ]
+   * Add python3-pyside2.qt{quickcontrols2,remoteobjects,serialport} packages.
+ 
+  -- Kurt Kremitzki <kkremitzki@debian.org>  Sat, 19 Dec 2020 14:26:09 -0600
  
  pyside2 (5.15.0-6) unstable; urgency=medium
  

diff --cc debian/control
index 9f6c3a62aa8e48bedddefde16fa009092f7b3903,3ee7e17b9df68d69d44e7b8310e61f42b7cf74f5..19eb89af8d2f196c10c736beaa3635ed2aaf95a5
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -33,29 -35,30 +35,30 @@@ Build-Depends: chrpath
                 python3-sphinx,
                 python3-sphinx-rtd-theme,
                 python3-wheel,
-                qml-module-qtquick-controls (>= 5.14),
-                qml-module-qtquick-layouts (>= 5.14),
-                qml-module-qtquick2 (>= 5.14),
-                qt3d-assimpsceneimport-plugin (>= 5.14),
-                qt3d-defaultgeometryloader-plugin (>= 5.14),
-                qt3d-gltfsceneio-plugin (>= 5.14),
-                qt3d-scene2d-plugin (>= 5.14),
-                qt3d5-dev (>= 5.14),
-                qt5-qmake (>= 5.14),
-                qt5-qmake-bin (>= 5.14),
-                qtbase5-dev (>= 5.14),
-                qtbase5-private-dev (>= 5.14),
+                qml-module-qtquick-controls2 (>= 5.15),
+                qml-module-qtquick-layouts (>= 5.15),
+                qml-module-qtquick2 (>= 5.15),
+                qt3d-assimpsceneimport-plugin (>= 5.15),
+                qt3d-defaultgeometryloader-plugin (>= 5.15),
+                qt3d-gltfsceneio-plugin (>= 5.15),
+                qt3d-scene2d-plugin (>= 5.15),
+                qt3d5-dev (>= 5.15),
+                qt5-qmake (>= 5.15),
+                qt5-qmake-bin (>= 5.15),
+                qtbase5-dev (>= 5.15),
+                qtbase5-private-dev (>= 5.15),
                 qtchooser,
-                qtdeclarative5-dev (>= 5.14),
-                qtdeclarative5-private-dev (>= 5.14),
-                qtlocation5-dev (>= 5.14),
-                qtmultimedia5-dev (>= 5.14),
-                qtpositioning5-dev (>= 5.14),
-                qtscript5-dev (>= 5.14),
-                qttools5-dev (>= 5.14),
-                qtwebengine5-dev (>= 5.14) [amd64 arm64 i386 mipsel],
+                qtdeclarative5-dev (>= 5.15),
+                qtdeclarative5-private-dev (>= 5.15),
+                qtlocation5-dev (>= 5.15),
+                qtmultimedia5-dev (>= 5.15),
+                qtpositioning5-dev (>= 5.15),
+                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
  Rules-Requires-Root: no
  Standards-Version: 4.5.0
  Homepage: https://wiki.qt.io/Qt_for_Python
@@@ -266,10 -285,9 +285,9 @@@ Description: Python bindings for Qt5 Qm
   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
- Multi-Arch: same
+  python3-pyside2.qtcore, python3-pyside2.qtnetwork
  Description: Python bindings for Qt5 WebEngineCore module (Python 3)
   pyside2 provides Python bindings for Qt 5.x framework.
   .
@@@ -675,10 -701,9 +701,9 @@@ Description: Python bindings for Qt5 Sc
   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
- Multi-Arch: same
  Description: Python bindings for Qt5 Web Engine (Python 3)
   pyside2 provides Python bindings for Qt 5.x framework.
   .

diff --cc debian/rules
Simple merge