From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 13 Nov 2020 11:54:58 +0000 (+0000)
Subject: Merge version 5.2.0-1+rpi1 and 5.2.0-2 to produce 5.2.0-2+rpi1
X-Git-Tag: archive/raspbian/5.2.0-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f003ef37fb870c266ea09ff117a07a2a8daffc23;p=ktorrent.git

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

f003ef37fb870c266ea09ff117a07a2a8daffc23
diff --cc debian/changelog
index 3bf3254,2032e5e..cf98757
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,15 +1,22 @@@
- ktorrent (5.2.0-1+rpi1) bullseye-staging; urgency=medium
++ktorrent (5.2.0-2+rpi1) bullseye-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 16 Aug 2020 14:14:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 13 Nov 2020 11:54:58 +0000
++
+ ktorrent (5.2.0-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Backport upstream commit f4c1c91d9b091941ebb4dae6aef95bcf9bc1c388 to fix
+     the cmake search and use of taglib; patch
+     upstream_Update-FindTaglib-from-ECM.patch (Closes: #973223)
+   * Fix day-of-week for changelog entry 1.1-1.
+   * Set upstream metadata fields: Repository, Repository-Browse.
+   * Add the configuration for the CI on salsa.
+   * Explicitly add the pkg-config build dependency.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 07 Nov 2020 10:52:19 +0100
  
  ktorrent (5.2.0-1) unstable; urgency=medium