Manual merge of version 5.13.2-3+rpi1 and 5.15.0-2 to produce 5.15.0-2+rpi1

diff --cc debian/changelog
index 5949e99ca85b17e9e6cfc80979b57fc59c854992,d15be442531ae9cf01f299752811274881acfa72..49a62149e60b778f882ee430fb02e8b2924bd971
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,65 +1,76 @@@
- pyside2 (5.13.2-3+rpi1) bullseye-staging; urgency=medium
++pyside2 (5.15.0-2+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
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 04 Jul 2020 19:50:29 +0000
++
+ pyside2 (5.15.0-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Preload libGLX_mesa.so.0 in web_engine_initialize.py, to work around
+     test failure on arm64 (closes: #963709).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 29 Jun 2020 15:26:26 +0300
+ 
+ pyside2 (5.15.0-1) unstable; urgency=medium
+ 
+   [ Gianfranco Costamagna ]
+   * Team upload
+   * Upload to unstable
+   * Drop trailing spaces from changelog file
+   * Bump compat level to 13
+   * Bump std-version to 4.5.0
+   * Add R^3: no
  
- pyside2 (5.13.2-3) unstable; urgency=medium
+  -- Kurt Kremitzki <kurt@kwk.systems>  Thu, 25 Jun 2020 21:15:20 -0500
  
-   * Add patches for Python 3.8 (Closes: #950129)
-   * Add test dep python3-distro
-   * Update shiboken2 doc path
+ pyside2 (5.15.0-1~exp1) experimental; urgency=medium
+ 
+   [ Steve Langasek ]
+   * Add test dependency on python3-all to fix autopkgtests (Closes: #950127)
+ 
+   [ Gianfranco Costamagna ]
+   * Add python3-distro needed for tests.
+   * Drop "uic" and "rcc" from control file, removed upstream (LP: #1874095)
+   * Add missing Breaks/Replaces for upgrading from previous version
+     (Closes: #949339)
+   * Drop pyside2uic tests, dropped upstream
+   * New upstream version 5.15.0 (Closes: #950126, Closes: #960008)
+   * Drop old Fix-build-with-Qt-5.12, addressed upstream
+   * Add patch to fix build failures with old qt implementation
+   * Refresh patches
+   * Bump copyright years
+   * Bump soname to 15
+   * Drop manpage, removed upstream
+   * Use llvm-9 to build, fixing a build failure
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 06 Jun 2020 14:48:45 +0200
+ 
+ pyside2 (5.14.0-1~exp1) experimental; urgency=medium
+ 
+   [ Raphaël Hertzog ]
+   * Team upload
+   * New upstream version 5.14.0. Closes: #945376, #947101
+   * Update patches (3 dropped, one new for Qt 5.12 compat)
+   * Use --ignore-git option instead of custom patch
+   * Update package names for version 5.14
+   * Drop python3-pyside2uic, there's no such library anymore
+   * Re-enable tests failing due to broken XDG_RUNTIME_DIR
+   * Drop package prefix from lintian overrides
+   * Drop removed file from debian/copyright
+   * Fix arch-all build on 32 bit arches. Closes: #948764
+     Thanks to peter green <plugwash@p10link.net> for the patch.
+ 
+   [ Kurt Kremitzki ]
    * Add CMake sed for pyside2 include path
    * Add CMake sed for multi-Python version support
-   * Add python3-all to autopkgtest deps (Closes: #950127)
-   * Remove Freexian folks from Uploaders
  
-  -- Kurt Kremitzki <kurt@kwk.systems>  Sun, 17 May 2020 20:27:01 -0500
+  -- Kurt Kremitzki <kurt@kwk.systems>  Mon, 13 Jan 2020 00:10:14 -0600
  
  pyside2 (5.13.2-2.2) unstable; urgency=medium
  

diff --cc debian/control
index 39a30f6fdd4c265f82f1c0bf39912d5808c068df,0c0e8ca20d56a95a0e7059a6fdaeadb85483211d..f442e240c70fee51698f58a2758c7750309b5157
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -49,8 -52,8 +52,7 @@@ Build-Depends: chrpath
                 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,
               qml-module-qtquick-controls,

diff --cc debian/rules
Simple merge