Merge version 1.2.9-0.3+rpi1 and 1.2.14-1.1 to produce 1.2.14-1.1+rpi1

diff --cc debian/changelog
index b8821bbebcbf02cd0a65b9a9c92d2e857e407615,b92519056950891949b4e7636229b9b503314932..306fcbf201372a562d8b3f6f76e04e0074125859
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,32 +1,41 @@@
- libtorrent-rasterbar (1.2.9-0.3+rpi1) bullseye-staging; urgency=medium
++libtorrent-rasterbar (1.2.14-1.1+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>  Mon, 06 Dec 2021 18:30:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 17 Jan 2022 13:25:58 +0000
++
+ libtorrent-rasterbar (1.2.14-1.1) 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.
+ 
+  -- Sergio Durigan Junior <sergiodj@debian.org>  Tue, 07 Dec 2021 16:57:32 -0500
+ 
+ libtorrent-rasterbar (1.2.14-1) unstable; urgency=medium
+ 
+   [ Debian Janitor ]
+   * Apply multi-arch hints.
+     + libtorrent-rasterbar-dbg, libtorrent-rasterbar-dev,
+       libtorrent-rasterbar10: Add Multi-Arch: same.
+     + libtorrent-rasterbar-doc: Add Multi-Arch: foreign.
+ 
+   [ Andrew Starr-Bochicchio ]
+   * New upstream release.
+   * Drop debian/patches/0001-python-move-storage.patch:
+    - Applied upstream.
+   * Stop building python3-libtorrent-dbg (Closes: #994306).
+   * debian/control: Add build depends on python3-setuptools and
+     libboost-tools-dev.
+ 
+  -- Andrew Starr-Bochicchio <asb@debian.org>  Sat, 25 Sep 2021 11:40:11 -0400
  
  libtorrent-rasterbar (1.2.9-0.3) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge