Manual merge of version 6.1.7-2+rpi1 and 6.1.8-2 to produce 6.1.8-2+rpi1

diff --cc debian/changelog
index 2cb68f815e05d56dce5a9859747715274fac68b1,ae318de6af5d80d0160c610d1534393cf6e163d0..3a17f63bc1bc735e5653add14ed559ce2ff0aef6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,19 +1,30 @@@
- zimlib (6.1.7-2+rpi1) bullseye-staging; urgency=medium
++zimlib (6.1.8-2+rpi1) bullseye-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 18 Jul 2020 02:37:09 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 26 Jul 2020 02:50:33 +0000
++
+ zimlib (6.1.8-2) unstable; urgency=medium
+ 
+   * Upload to unstable
+   * Confirm arm64 armel armhf hppa i386 m68k powerpc ppc64 ppc64el
+     riscv64 s390x sparc64 x32 symbols
+ 
+  -- Kunal Mehta <legoktm@debian.org>  Fri, 17 Jul 2020 14:37:43 -0700
+ 
+ zimlib (6.1.8-1) experimental; urgency=medium
+ 
+   * New upstream version 6.1.8
+   * Switch to debhelper compat 13, bump test timeout through `meson test`
+   * Update d/copyright
+   * Update libzim6.symbols
+ 
+  -- Kunal Mehta <legoktm@debian.org>  Fri, 17 Jul 2020 00:47:57 -0700
  
  zimlib (6.1.7-2) unstable; urgency=medium
  

diff --cc debian/libzim6.symbols
Simple merge