Manual merge of version 21.12.3-1+rpi1 and 22.12.3-1 to produce 22.12.3-1+rpi1 bookworm-staging archive/raspbian/22.12.3-1+rpi1 raspbian/22.12.3-1+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Tue, 14 Mar 2023 00:24:03 +0000 (00:24 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Tue, 14 Mar 2023 00:24:03 +0000 (00:24 +0000)
1  2 
debian/changelog
debian/control

index 5b8ce217193d3131d3ae1dbc7399791c622b639f,6d3eb9546b82d50ac01f9520006ea4747a6781f8..6aca73cf6dc87ea602f6cd384c36292e35a450b3
@@@ -1,13 -1,31 +1,42 @@@
- ktorrent (21.12.3-1+rpi1) bookworm-staging; urgency=medium
++ktorrent (22.12.3-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.
 +
 +  [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>  Sun, 17 Jul 2022 08:04:30 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 14 Mar 2023 00:23:02 +0000
++
+ ktorrent (22.12.3-1) unstable; urgency=medium
+   [ Aurélien COUDERC ]
+   * New upstream release (22.12.3).
+   * Update build-deps and deps with the info from cmake.
+  -- Aurélien COUDERC <coucouf@debian.org>  Wed, 01 Mar 2023 11:58:23 +0100
+ ktorrent (22.12.1-1) unstable; urgency=medium
+   [ Aurélien COUDERC ]
+   * New upstream release (22.12.1).
+   * Bump Standards-Version to 4.6.2, no change required.
+   * Add/update Albert Astals Cid’s master key in upstream signing keys.
+  -- Aurélien COUDERC <coucouf@debian.org>  Sat, 07 Jan 2023 00:06:24 +0100
+ ktorrent (22.12.0-1) unstable; urgency=medium
+   [ Aurélien COUDERC ]
+   * New upstream release (22.11.90).
+   * Update build-deps and deps with the info from cmake.
+   * Bump Standards-Version to 4.6.1, no change required.
+   * New upstream release (22.12.0).
+   * Update the list of installed files from build logs.
+   * Refresh copyright information.
+  -- Aurélien COUDERC <coucouf@debian.org>  Sun, 11 Dec 2022 23:06:44 +0100
  
  ktorrent (21.12.3-1) unstable; urgency=medium
  
diff --cc debian/control
index 712ad51f203af2d364716f3676e1dc197aa19c7e,3e408e626d1055c9ddf98e26163e96989aa40427..019b43e6400e98260706830cae812d102af9b626
@@@ -10,44 -10,44 +10,44 @@@ Build-Depends: cmake (>= 3.16~)
                 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],
+                libkf5archive-dev (>= 5.91~),
+                libkf5completion-dev (>= 5.91~),
+                libkf5config-dev (>= 5.91~),
+                libkf5configwidgets-dev (>= 5.91~),
+                libkf5coreaddons-dev (>= 5.91~),
+                libkf5crash-dev (>= 5.91~),
+                libkf5dbusaddons-dev (>= 5.91~),
+                libkf5dnssd-dev (>= 5.91~),
+                libkf5doctools-dev (>= 5.91~),
+                libkf5i18n-dev (>= 5.91~),
+                libkf5iconthemes-dev (>= 5.91~),
+                libkf5itemviews-dev (>= 5.91~),
+                libkf5kcmutils-dev (>= 5.91~),
+                libkf5kio-dev (>= 5.91~),
+                libkf5notifications-dev (>= 5.91~),
+                libkf5notifyconfig-dev (>= 5.91~),
+                libkf5parts-dev (>= 5.91~),
+                libkf5plotting-dev (>= 5.91~),
+                libkf5solid-dev (>= 5.91~),
+                libkf5syndication-dev (>= 1:5.91~),
+                libkf5textwidgets-dev (>= 5.91~),
+                libkf5widgetsaddons-dev (>= 5.91~),
+                libkf5windowsystem-dev (>= 5.91~),
+                libkf5xmlgui-dev (>= 5.91~),
+                libktorrent-dev (>= 20.11.70~),
                 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~),
-                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~),
                 libtag1-dev,
- Standards-Version: 4.6.0
+                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 armhf i386 mipsel],
++               qtwebengine5-dev (>= 5.15.2~) [amd64 arm64 i386 mipsel],
+ Standards-Version: 4.6.2
  Rules-Requires-Root: no
  Homepage: https://www.kde.org/applications/internet/ktorrent/
- Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/ktorrent.git
- Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/ktorrent
+ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/ktorrent.git
+ Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/ktorrent
  
  Package: ktorrent
  Architecture: any