From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 1 Oct 2024 16:42:07 +0000 (+0100)
Subject: Merge version 22.12.3-1+rpi1 and 22.12.3-2 to produce 22.12.3-2+rpi1
X-Git-Tag: archive/raspbian/22.12.3-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3b4dda3a87b33c7eb32705e50e8535a40fae4ef9;p=ktorrent.git

Merge version 22.12.3-1+rpi1 and 22.12.3-2 to produce 22.12.3-2+rpi1
---

3b4dda3a87b33c7eb32705e50e8535a40fae4ef9
diff --cc debian/changelog
index 6aca73c,d9acc97..22995ec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,13 +1,24 @@@
- ktorrent (22.12.3-1+rpi1) bookworm-staging; urgency=medium
++ktorrent (22.12.3-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 5.2.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 16 Aug 2020 14:14:40 +0000]
 +  * Remove armhf from architecture list for qtwebengine build-dependency.
 +
 +  [changes introduced in 21.12.3-1+rpi1 by Peter Michael Green]
 +  * Don't fail the build due to missing documentation files due to lack of
 +    qtwebengine.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 14 Mar 2023 00:23:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Oct 2024 16:42:07 +0000
++
+ ktorrent (22.12.3-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Stop using qtwebengine5-dev on mipsel, as it will be removed soon from
+     that architecture.
+   * Update the build dependencies according to the upstream build system:
+     - drop unused kross-dev, and qtscript5-dev
+   * Drop NEWS file, as the latest entry there was added in 2008.
+ 
+  -- Pino Toscano <pino@debian.org>  Wed, 19 Jul 2023 06:03:13 +0200
  
  ktorrent (22.12.3-1) unstable; urgency=medium
  
diff --cc debian/control
index 019b43e,073e999..891075a
--- a/debian/control
+++ b/debian/control
@@@ -41,8 -40,7 +40,7 @@@ Build-Depends: cmake (>= 3.16~)
                 pkg-config,
                 pkg-kde-tools (>= 0.15.16),
                 qtbase5-dev (>= 5.15.2~),
-                qtscript5-dev (>= 5.7.0),
-                qtwebengine5-dev (>= 5.15.2~) [amd64 arm64 i386 mipsel],
 -               qtwebengine5-dev (>= 5.15.2~) [amd64 arm64 armhf i386],
++               qtwebengine5-dev (>= 5.15.2~) [amd64 arm64 i386],
  Standards-Version: 4.6.2
  Rules-Requires-Root: no
  Homepage: https://www.kde.org/applications/internet/ktorrent/