From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 26 Oct 2021 23:13:20 +0000 (+0100)
Subject: Merge version 5.2.0-2+rpi1 and 21.08.0-1 to produce 21.08.0-1+rpi1
X-Git-Tag: archive/raspbian/21.08.0-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f7c5a06209272abb7b751f5a0f197d19c005d50f;p=ktorrent.git

Merge version 5.2.0-2+rpi1 and 21.08.0-1 to produce 21.08.0-1+rpi1
---

f7c5a06209272abb7b751f5a0f197d19c005d50f
diff --cc debian/changelog
index cf98757,ee52bbe..b97ebd2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- ktorrent (5.2.0-2+rpi1) bullseye-staging; urgency=medium
++ktorrent (21.08.0-1+rpi1) bookworm-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 13 Nov 2020 11:54:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 26 Oct 2021 23:13:19 +0000
++
+ ktorrent (21.08.0-1) unstable; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release based from KDE Gears (21.08.0).
+   * Update watch file.
+   * Add upstream signing key.
+   * Drop patch.
+ 
+  -- Norbert Preining <norbert@preining.info>  Fri, 20 Aug 2021 11:43:52 +0900
  
  ktorrent (5.2.0-2) unstable; urgency=medium
  
diff --cc debian/control
index b034a6c,5818315..f12adf9
--- a/debian/control
+++ b/debian/control
@@@ -3,41 -3,46 +3,46 @@@ Section: ne
  Priority: optional
  Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
  Uploaders: Modestas Vainius <modax@debian.org>
- Build-Depends: cmake (>= 2.8.12), debhelper-compat (= 13), pkg-kde-tools (>= 0.15.16),
-  gettext,
-  pkg-config,
-  extra-cmake-modules,
-  qtbase5-dev (>= 5.7.0),
-  qtscript5-dev (>= 5.7.0),
-  qtwebengine5-dev (>= 5.7.0) [amd64 arm64 i386 mipsel],
-  libphonon4qt5-dev, libphonon4qt5experimental-dev,
-  libkf5archive-dev (>= 5.15),
-  libkf5completion-dev (>= 5.15),
-  libkf5config-dev (>= 5.15),
-  libkf5configwidgets-dev (>= 5.15),
-  libkf5coreaddons-dev (>= 5.15),
-  libkf5crash-dev (>= 5.15),
-  libkf5dbusaddons-dev (>= 5.15),
-  libkf5dnssd-dev (>= 5.15),
-  libkf5doctools-dev (>= 5.15),
-  libkf5i18n-dev (>= 5.15),
-  libkf5iconthemes-dev (>= 5.15),
-  libkf5kio-dev (>= 5.15),
-  libkf5itemviews-dev (>= 5.15),
-  libkf5notifications-dev (>= 5.15),
-  libkf5notifyconfig-dev (>= 5.15),
-  libkf5kcmutils-dev (>= 5.15),
-  libkf5parts-dev (>= 5.15),
-  libkf5plotting-dev (>= 5.15),
-  libkf5solid-dev (>= 5.15),
-  libkf5textwidgets-dev (>= 5.15),
-  libkf5widgetsaddons-dev (>= 5.15),
-  libkf5windowsystem-dev (>= 5.15),
-  libkf5xmlgui-dev (>= 5.15),
-  kross-dev (>= 5.15),
-  libkf5syndication-dev,
-  libboost-dev,
-  libktorrent-dev (>= 2.2.0~), libtag1-dev, libgeoip-dev,
+ Build-Depends: cmake (>= 3.16~),
+                debhelper-compat (= 13),
 -               extra-cmake-modules (>= 5.82~),
++               pkg-kde-tools (>= 0.15.16),
+                gettext,
++               pkg-config,
++               extra-cmake-modules (>= 5.82~),
+                kross-dev (>= 5.82~),
+                libboost-dev (>= 1.71.0~),
+                libgeoip-dev,
++               qtbase5-dev (>= 5.15.0~),
++               qtscript5-dev (>= 5.7.0),
++               qtwebengine5-dev (>= 5.15.0~) [amd64 arm64 i386 mipsel],
++               libphonon4qt5-dev,
++               libphonon4qt5experimental-dev,
+                libkf5archive-dev (>= 5.82~),
+                libkf5completion-dev (>= 5.82~),
+                libkf5config-dev (>= 5.82~),
+                libkf5configwidgets-dev (>= 5.82~),
+                libkf5coreaddons-dev (>= 5.82~),
+                libkf5crash-dev (>= 5.82~),
+                libkf5dbusaddons-dev (>= 5.82~),
+                libkf5dnssd-dev (>= 5.82~),
+                libkf5doctools-dev (>= 5.82~),
+                libkf5i18n-dev (>= 5.82~),
+                libkf5iconthemes-dev (>= 5.82~),
++               libkf5kio-dev (>= 5.82~),
+                libkf5itemviews-dev (>= 5.82~),
+                libkf5kcmutils-dev (>= 5.82~),
 -               libkf5kio-dev (>= 5.82~),
+                libkf5notifications-dev (>= 5.82~),
+                libkf5notifyconfig-dev (>= 5.82~),
+                libkf5parts-dev (>= 5.82~),
+                libkf5plotting-dev (>= 5.82~),
+                libkf5solid-dev (>= 5.82~),
+                libkf5syndication-dev (>= 1:5.82~),
+                libkf5textwidgets-dev (>= 5.82~),
+                libkf5widgetsaddons-dev (>= 5.82~),
+                libkf5windowsystem-dev (>= 5.82~),
+                libkf5xmlgui-dev (>= 5.82~),
+                libktorrent-dev (>= 20.11.70~),
 -               libphonon4qt5-dev,
 -               libphonon4qt5experimental-dev,
+                libtag1-dev,
 -               pkg-config,
 -               pkg-kde-tools (>= 0.15.16),
 -               qtbase5-dev (>= 5.15.0~),
 -               qtscript5-dev (>= 5.7.0),
 -               qtwebengine5-dev (>= 5.15.0~) [amd64 arm64 armhf i386 mipsel],
  Standards-Version: 4.5.0
  Rules-Requires-Root: no
  Homepage: https://www.kde.org/applications/internet/ktorrent/