Merge version 6.1.3-4+rpi1 and 6.1.7-2 to produce 6.1.7-2+rpi1

diff --cc debian/changelog
index aca6690878d03fc83f58b0325903021dd7c3dd66,a5d8d94f3e94e8b738a37ee51c115781735bcd0d..2cb68f815e05d56dce5a9859747715274fac68b1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,18 +1,29 @@@
- zimlib (6.1.3-4+rpi1) bullseye-staging; urgency=medium
++zimlib (6.1.7-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 09 Jul 2020 15:10:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 18 Jul 2020 02:37:09 +0000
++
+ zimlib (6.1.7-2) unstable; urgency=medium
+ 
+   * Upload to unstable
+   * Bump test timeout to 300 seconds
+   * Confirm alpha arm64 armel armhf hppa i386 ia64 m68k powerpc ppc64
+     ppc64el riscv64 s390x sh4 x32 symbols
+ 
+  -- Kunal Mehta <legoktm@debian.org>  Tue, 07 Jul 2020 16:38:35 -0700
+ 
+ zimlib (6.1.7-1) experimental; urgency=medium
+ 
+   * New upstream version 6.1.7
+   * Increase test timeout for slower architectures (Closes: #964196)
+ 
+  -- Kunal Mehta <legoktm@debian.org>  Sat, 04 Jul 2020 02:14:19 -0700
  
  zimlib (6.1.3-4) unstable; urgency=medium
  

diff --cc debian/libzim6.symbols
Simple merge