From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 18 Dec 2020 18:57:53 +0000 (+0000)
Subject: Merge version 5.15.0-5+rpi1 and 5.15.0-6 to produce 5.15.0-6+rpi1
X-Git-Tag: archive/raspbian/5.15.0-6+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f875ace8c1af13d0fc56fe91d71216d423a45387;p=pyside2.git

Merge version 5.15.0-5+rpi1 and 5.15.0-6 to produce 5.15.0-6+rpi1
---

f875ace8c1af13d0fc56fe91d71216d423a45387
diff --cc debian/changelog
index 6c18cc0,ef3b1d9..6c55b43
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,18 +1,29 @@@
- pyside2 (5.15.0-5+rpi1) bullseye-staging; urgency=medium
++pyside2 (5.15.0-6+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>  Mon, 26 Oct 2020 14:48:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Dec 2020 18:57:52 +0000
++
+ pyside2 (5.15.0-6) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Debian Janitor ]
+   * Apply multi-arch hints.
+     + python-pyside2-doc, shiboken2-doc: Add Multi-Arch: foreign.
+     + libshiboken2-dev, python3-pyside2.qt*: Add Multi-Arch: same.
+ 
+   [ Dmitry Shachnev ]
+   * Drop ftbfs-old-qt.patch. Not needed since Debian has Qt 5.15.
+   * Stop hardcoding py3.8 in debian/shiboken2-doc.docs (closes: #976900).
+   * Blacklist QtWidgets::bug_307 test for now (closes: #976516).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 14 Dec 2020 20:31:39 +0300
  
  pyside2 (5.15.0-5) unstable; urgency=medium
  
diff --cc debian/control
index a648c3f,0f15772..9f6c3a6
--- a/debian/control
+++ b/debian/control
@@@ -256,9 -266,10 +266,10 @@@ 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
  Description: Python bindings for Qt5 WebEngineCore module (Python 3)
   pyside2 provides Python bindings for Qt 5.x framework.
   .
@@@ -634,9 -675,10 +675,10 @@@ 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.
   .