Manual merge of version 1.2.14-1.1+rpi1 and 2.0.5-5 to produce 2.0.5-5+rpi1

diff --cc debian/changelog
index 306fcbf201372a562d8b3f6f76e04e0074125859,744298c4768963d670a487ea6de8ae19a7548421..7b8f04704947bd5e382d5001cfe7e31187a8f174
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,48 +1,57 @@@
- libtorrent-rasterbar (1.2.14-1.1+rpi1) bookworm-staging; urgency=medium
++libtorrent-rasterbar (2.0.5-5+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 )
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 17 Jan 2022 13:25:58 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 09 Feb 2022 18:32:28 +0000
 +
- libtorrent-rasterbar (1.2.14-1.1) unstable; urgency=medium
+ libtorrent-rasterbar (2.0.5-5) unstable; urgency=medium
  
-   * Non-maintainer upload.
-   * Fix FTBFS due to problematic C++17 detection.
-     - d/rules: Pass '--with-cxx-standard=14' to configure.
-     Thanks to Petter Reinholdtsen <pere@hungry.com> for the patch
-     (Closes: #997363)
-   * d/p/fix-python-version-comparison.patch: Fix Python version comparison.
-     This fixes a problem when detecting Python 3.10.
+   * Well, really fix bug #1004702
  
-  -- Sergio Durigan Junior <sergiodj@debian.org>  Tue, 07 Dec 2021 16:57:32 -0500
+  -- Christian Marillat <marillat@debian.org>  Tue, 01 Feb 2022 15:13:18 +0100
+ 
+ libtorrent-rasterbar (2.0.5-4) unstable; urgency=medium
+ 
+   * debian/control replace python3-all-dev by python3-dev (Closes: #1004702)
+ 
+  -- Christian Marillat <marillat@debian.org>  Tue, 01 Feb 2022 01:09:11 +0100
+ 
+ libtorrent-rasterbar (2.0.5-3) unstable; urgency=medium
+ 
+   * Build for unstable.
+ 
+  -- Christian Marillat <marillat@debian.org>  Sun, 30 Jan 2022 19:29:05 +0100
+ 
+ libtorrent-rasterbar (2.0.5-2) experimental; urgency=medium
+ 
+   * debian/copyright add simulation/libsimulator/*
+ 
+  -- Christian Marillat <marillat@debian.org>  Sun, 23 Jan 2022 13:10:13 +0100
+ 
+ libtorrent-rasterbar (2.0.5-1) unstable; urgency=medium
+ 
+   * New maintainer (Closes: #995076)
+   * New upstream release (CLoses: #969780)
+   * Fix python issues (Closes: #992575, #856600)
+   * Fix security issues (Closes: #987120)
+   * Fix vlc-plugin-bittorrent crash (Closes: #916399)
+   * Fix deluge crash (Closes: #999422)
+ 
+  -- Christian Marillat <marillat@debian.org>  Fri, 17 Dec 2021 11:21:19 +0100
+ 
+ libtorrent-rasterbar (2.0.4-1) experimental; urgency=medium
+ 
+   * New maintainer (Closes: #995076)
+   * Bump Standards-Version to 4.6.0 (No change)
+   * Upgrade to debhelper-compat 13 and dh-sequence-python3
+   * Remove unneeded libtorrent-rasterbar-dbg package.
+   * debian/rules Don't use 'dh_makeshlibs -V' now the default with debhelper 13
+   * Build with cmake and ninja
+ 
+  -- Christian Marillat <marillat@debian.org>  Thu, 30 Sep 2021 14:53:12 +0200
  
  libtorrent-rasterbar (1.2.14-1) unstable; urgency=medium
  

diff --cc debian/rules
index ddb03eed1092a9d8c3b3bcf7b8f3b383ede48ebf,32dfdd76e09d8785d2937e0f30e4907ca915a673..47accbbd02429f77731e0779e86fb9a5ecc3c579
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -3,10 -3,7 +3,7 @@@
  DPKG_EXPORT_BUILDFLAGS = 1
  include /usr/share/dpkg/buildflags.mk
  
- export DEB_LDFLAGS_MAINT_APPEND  = -Wl,--as-needed
- export DEB_CXXFLAGS_MAINT_APPEND  = -std=c++14
- 
 -ifneq (,$(filter $(DEB_HOST_ARCH), armel mipsel m68k powerpc riscv64 sh4))
 +ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf mipsel m68k powerpc riscv64 sh4))
    export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
  endif