From: Peter Michael Green <plugwash@raspbian.org>
Date: Sun, 24 May 2020 10:42:11 +0000 (+0000)
Subject: Manual merge of version 5.13.2-2.2+rpi1 and 5.13.2-3 to produce 5.13.2-3+rpi1
X-Git-Tag: archive/raspbian/5.13.2-3+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f862fbd43b45bef39b79dec32cc61e3b3b522020;p=pyside2.git

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

f862fbd43b45bef39b79dec32cc61e3b3b522020
diff --cc debian/changelog
index 4d3570d,88d1d0e..be10108
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,14 +1,26 @@@
- pyside2 (5.13.2-2.2+rpi1) bullseye-staging; urgency=medium
++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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 12 Jan 2020 16:30:16 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 24 May 2020 10:41:01 +0000
++
+ pyside2 (5.13.2-3) unstable; urgency=medium
+ 
+   * Add patches for Python 3.8 (Closes: #950129)
+   * Add test dep python3-distro
+   * Update shiboken2 doc path
+   * 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
  
  pyside2 (5.13.2-2.2) unstable; urgency=medium
  
diff --cc debian/control
index 42ea5d3,fe43c44..39a30f6
--- a/debian/control
+++ b/debian/control
@@@ -51,7 -49,9 +49,8 @@@ 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/shiboken2-doc.docs
index 5233769,fae72d0..08fcfc3
--- a/debian/shiboken2-doc.docs
+++ b/debian/shiboken2-doc.docs
@@@ -1,1 -1,1 +1,1 @@@
- pyside3_build/py3.7-qt5.12.5-??bit-relwithdebinfo/shiboken2/doc/html
 -pyside3_build/py3.8-qt5.12.5-64bit-relwithdebinfo/shiboken2/doc/html
++pyside3_build/py3.8-qt5.12.5-??bit-relwithdebinfo/shiboken2/doc/html