From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 10 Feb 2023 10:10:54 +0000 (+0000)
Subject: Merge version 6.4.2+dfsg~rc1-3+rpi1 and 6.4.2+dfsg-1 to produce 6.4.2+dfsg-1+rpi1
X-Git-Tag: archive/raspbian/6.4.2+dfsg-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1bfd69bb702c1ae6f48a10071ff2ed814c228da0;p=qt6-base.git

Merge version 6.4.2+dfsg~rc1-3+rpi1 and 6.4.2+dfsg-1 to produce 6.4.2+dfsg-1+rpi1
---

1bfd69bb702c1ae6f48a10071ff2ed814c228da0
diff --cc debian/changelog
index f08583d1,f1715bde..cad8d67e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,26 @@@
- qt6-base (6.4.2+dfsg~rc1-3+rpi1) bookworm-staging; urgency=medium
++qt6-base (6.4.2+dfsg-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 6.3.1+dfsg-8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 25 Aug 2022 20:03:22 +0000]
 +  * Update symbols file for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 08 Jan 2023 23:44:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 10 Feb 2023 10:10:53 +0000
++
+ qt6-base (6.4.2+dfsg-1) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Switch to the official 6.4.2 tarball, the tarball is the same.
+ 
+   [ Helmut Grohne ]
+   * Fix FTCBFS: Pass QT_HOST_PATH. (Closes: #1023054)
+     + cross.patch: Honour PKG_CONFIG_EXECUTABLE
+     + cross.patch: Allow building android tools
+     + Pass QT_HOST_* variables to build.
+     + Depend on a native qt toolchain for the former.
+     + Do build tools even when cross building.
+     + Add excess files to debian/not-installed.
+   * Install <triplet>-qmake6 cross wrapper (Closes: #1025663).
+ 
+  -- Patrick Franz <deltaone@debian.org>  Tue, 31 Jan 2023 19:16:32 +0100
  
  qt6-base (6.4.2+dfsg~rc1-3) unstable; urgency=medium