Merge version 8.0.0-2+rpi1 and 8.0.0-2.1 to produce 8.0.0-2.1+rpi1

diff --cc debian/changelog
index dc4c52c5f4dbd0ca081bee7273b8102da8fc06fa,ba259617550e4206ed460aa9641e04654aa3cc48..a42733f5f4661427f76020a1769c686eb9645f1a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,10 +1,24 @@@
- zimlib (8.0.0-2+rpi1) bookworm-staging; urgency=medium
++zimlib (8.0.0-2.1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 4.0.4-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 18 Jan 2019 22:43:45 +0000]
 +  * Update symbols file for Raspbian.
 +
 +  [changes brought forward from 4.0.4-5+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 07 Jun 2020 17:28:23 +0000]
 +  * Disable testsuite.
 +  * Fix clean target.
 +
 +  [changes introduced in 6.3.0-2+rpi1 by Peter Michael Green]
 +  * Further symbols file updates for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 03 Sep 2022 09:19:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 20 Nov 2022 18:30:08 +0000
++
+ zimlib (8.0.0-2.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * debian/control: Drop unnecessary Conflicts+Replaces on old library
+     versions (Closes: #1020214)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 06 Nov 2022 18:21:21 +0100
  
  zimlib (8.0.0-2) unstable; urgency=medium