Merge version 3.16.3-3+rpi1 and 3.18.2-1 to produce 3.18.2-1+rpi1

diff --cc debian/changelog
index b4e78b8fff5f8a7fbaeed2801f8c344d3806a417,1e153f1506e817b537f4c79972c8b6489d685e5b..faf6c1701c9e2ad81f4eb59bd49c0920cbaad74a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,17 @@@
- cmake (3.16.3-3+rpi1) bullseye-staging; urgency=medium
++cmake (3.18.2-1+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Mon, 11 May 2020 11:15:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 28 Sep 2020 10:35:31 +0000
++
+ cmake (3.18.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop FindPkgConfig_also_handle_isystem.patch, applied upstream.
+ 
+  -- Felix Geyer <fgeyer@debian.org>  Sun, 30 Aug 2020 14:41:24 +0200
  
  cmake (3.16.3-3) unstable; urgency=medium