Merge version 3.18.4-1+rpi1 and 3.18.4-2 to produce 3.18.4-2+rpi1

diff --cc debian/changelog
index ed8f8c4d6d6483a6d9f9d78add4a3f32717f9686,ab7f47b4559d3641aa652058b015ec61197c2e0c..6e4c5a177065093416525c070d1119c04b5db1fb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,21 @@@
- cmake (3.18.4-1+rpi1) bullseye-staging; urgency=medium
++cmake (3.18.4-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 3.16.3-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 11 May 2020 11:15:49 +0000]
 +  * Disable testsuite.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 26 Oct 2020 15:00:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 10 Feb 2021 12:52:09 +0000
++
+ cmake (3.18.4-2) unstable; urgency=medium
+ 
+   [ Helmut Grohne ]
+   * Drop unused Build-Depends: libbz2-dev and liblzma-dev. (Closes: #981135)
+     Compression support is handled via libarchive.
+ 
+   [ Felix Geyer ]
+   * Mark cmake-data as Multi-Arch: foreign. (Closes: #973392)
+ 
+  -- Felix Geyer <fgeyer@debian.org>  Sun, 07 Feb 2021 10:23:34 +0100
  
  cmake (3.18.4-1) unstable; urgency=medium