From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 22 Jun 2022 10:04:26 +0000 (+0100)
Subject: Merge version 5.15.2-2+rpi2 and 5.15.2-2.3 to produce 5.15.2-2.3+rpi1
X-Git-Tag: archive/raspbian/5.15.2-2.3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6da6301438a763e0c877c8d2b411c1eb63cfe1cc;p=pyside2.git

Merge version 5.15.2-2+rpi2 and 5.15.2-2.3 to produce 5.15.2-2.3+rpi1
---

6da6301438a763e0c877c8d2b411c1eb63cfe1cc
diff --cc debian/changelog
index b490dd8,ebfafd4..8812495
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,25 +1,41 @@@
- pyside2 (5.15.2-2+rpi2) bookworm-staging; urgency=medium
++pyside2 (5.15.2-2.3+rpi1) bookworm-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.
++
++  [changes brought forward from 5.15.2-2+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sat, 05 Feb 2022 15:09:17 +0000]
 +  * Add build-conflicts on libshiboken2-dev
 +  * Improve replacement rules for paths
 +    (still not ideal)
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 05 Feb 2022 15:09:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Jun 2022 10:04:26 +0000
 +
- pyside2 (5.15.2-2+rpi1) bookworm-staging; urgency=medium
+ pyside2 (5.15.2-2.3) unstable; 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.
+   * Call "py3versions -d" instead of "py3versions -r" in tests.
+   * 
  
-   [changes introduced in 5.13.2-3+rpi1 by Peter Michael Green]
-   * Disable testsuite.
+  -- Christian Marillat <marillat@debian.org>  Fri, 17 Jun 2022 17:49:37 +0200
+ 
+ pyside2 (5.15.2-2.2) unstable; urgency=medium
+ 
+   * Don't test with python3-all but python3 as only the current python3 is
+     supported.  (Closes:# 1012878)
+ 
+  -- Christian Marillat <marillat@debian.org>  Thu, 16 Jun 2022 10:57:23 +0200
+ 
+ pyside2 (5.15.2-2.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Should always Build-Depends on python3-dev but not on python3-all-dev. 
+     This package is unable to manage two python versions at the same time.
+     (Closes: #1008849)
  
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 24 Nov 2021 04:42:48 +0000
+  -- Christian Marillat <marillat@debian.org>  Sun, 12 Jun 2022 18:30:03 +0200
  
  pyside2 (5.15.2-2) unstable; urgency=medium