Manual merge of version 5.2.0-1+rpi1 and 5.2.0-2 to produce 5.2.0-2+rpi1

diff --cc debian/changelog
index 39589dcff39fa31babebf432af150154e3758a9e,3a62e7f482c8f2c09fa6f219e39fcd1ccc5c05ad..c406c651508ef08c2f820c760659b29589e9cc80
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,8 +1,21 @@@
- supermin (5.2.0-1+rpi1) bullseye-staging; urgency=medium
++supermin (5.2.0-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 5.1.11-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Nov 2014 05:45:23 +0000]
 +  * Build-depend on raspbian kernel rather than debian armmp kernel.
 +
 +  [changes brought forward from 5.1.20-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 03 Dec 2019 01:42:22 +0000]
 +  * Drop linux-image-rpi build-dependency, we currently don't have kernels
 +    in raspbian bullseye.
 +  * Disable testsuite.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Mar 2020 06:47:56 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 05 Sep 2020 20:03:57 +0000
++
+ supermin (5.2.0-2) unstable; urgency=medium
+ 
+   * Don't dwz supermin binary (Closes: #968476)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 30 Aug 2020 22:29:40 +0200
  
  supermin (5.2.0-1) unstable; urgency=medium
  

diff --cc debian/rules
index 783271b3ae56b9217830966cf7e3861350732b20,44aa67be53e1fd0b7e612ed1bc6f7e777aba5778..e0f13b94e48c4c4477a5437b3bc33686d516ccde
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -25,9 -25,8 +25,12 @@@ override_dh_auto_test
  override_dh_gencontrol:
        dh_gencontrol -- -Vmisc:Built-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W $(if $(shell which musl-gcc),musl-tools,libc-dev-bin))"
  
 +override_dh_auto_clean:
 +      dh_auto_clean
 +      rm -f src/.depend src/pod2htmd.tmp
 +
+ override_dh_dwz:
+       dh_dwz -X/usr/bin/supermin
+ 
  %:
        dh $@ --with=ocaml