Merge version 6.2.0-2+rpi1 and 6.2.2-1 to produce 6.2.2-1+rpi1

diff --cc debian/changelog
index 8a09a45dbd31e24263d2b9dd3fe2d4b10a285442,0214596f1beb228d21aac4dfff5c75e605088518..37c274b7010763cbe329bab1168661fa8eca1fc4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,9 +1,20 @@@
- zimlib (6.2.0-2+rpi1) bullseye-staging; urgency=medium
++zimlib (6.2.2-1+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>  Sat, 05 Sep 2020 11:13:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Sep 2020 13:10:10 +0000
++
+ zimlib (6.2.2-1) unstable; urgency=medium
+ 
+   * New upstream version 6.2.2
+   * Drop symbols file (Closes: #969196, #924572)
+ 
+  -- Kunal Mehta <legoktm@debian.org>  Sat, 05 Sep 2020 02:29:25 -0700
  
  zimlib (6.2.0-2) unstable; urgency=medium
  

diff --cc debian/rules
index bf6142b0f3d80e393878f59a0a48049c3f15ddc1,1c7a791452ded521e85474b13f4c516cde5ac596..25a6c0a460ade52c5f0a00766db153d7cc9487cf
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -4,11 -4,8 +4,11 @@@ export DEB_BUILD_MAINT_OPTIONS = harden
  # Skip some extremely memory-intensive tests
  export SKIP_BIG_MEMORY_TEST=1
  %:
-       dh $@ --with pkgkde_symbolshelper --buildsystem=meson
+       dh $@ --buildsystem=meson
  
 -# Increase test timeout
  override_dh_auto_test:
 -      dh_auto_test -- -t 3
 +      echo testsuite disabled
 +
 +override_dh_auto_clean:
 +      rm -rf test/pytest/__pycache__
 +      dh_auto_clean