From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 8 Mar 2022 21:29:57 +0000 (+0000)
Subject: Merge version 2.0.5-5+rpi1 and 2.0.5-6 to produce 2.0.5-6+rpi1
X-Git-Tag: archive/raspbian/2.0.5-6+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fe8a576717be6ad2ef201737a758b5e13467aeba;p=libtorrent-rasterbar.git

Merge version 2.0.5-5+rpi1 and 2.0.5-6 to produce 2.0.5-6+rpi1
---

fe8a576717be6ad2ef201737a758b5e13467aeba
diff --cc debian/changelog
index 7b8f047,0a5d80c..0aa9717
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,17 @@@
- libtorrent-rasterbar (2.0.5-5+rpi1) bookworm-staging; urgency=medium
++libtorrent-rasterbar (2.0.5-6+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.2.9-0.3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 06 Dec 2021 18:30:57 +0000]
 +  * Link with libatomic on armhf too 
 +    (without it the package builds successfully on raspbian, but the
 +    python module at least fails to load). ( LP: 1945530 )
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 09 Feb 2022 18:32:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 08 Mar 2022 21:29:57 +0000
++
+ libtorrent-rasterbar (2.0.5-6) unstable; urgency=medium
+ 
+   * Remove uneeded ConvertUTF.cpp/.h in debian/copyright (CLoses: #1003423)
+ 
+  -- Christian Marillat <marillat@debian.org>  Sat, 26 Feb 2022 15:39:40 +0100
  
  libtorrent-rasterbar (2.0.5-5) unstable; urgency=medium