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

diff --cc debian/changelog
index faf6c1701c9e2ad81f4eb59bd49c0920cbaad74a,6b60e01857cc148d76d1c4245687d9b0d2431658..ed8f8c4d6d6483a6d9f9d78add4a3f32717f9686
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,18 +1,26 @@@
- cmake (3.18.2-1+rpi1) bullseye-staging; urgency=medium
++cmake (3.18.4-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 28 Sep 2020 10:35:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 26 Oct 2020 15:00:45 +0000
++
+ cmake (3.18.4-1) unstable; urgency=medium
+ 
+   [ Tobias Frost ]
+   * B-D on libarchive >=3.3.3 (Closes: #972252)
+ 
+   [ Kyle Edwards ]
+   * Set --docdir to actual destination
+ 
+   [ Felix Geyer ]
+   * New upstream release
+   * Cherry-pick commit to build with -D_FILE_OFFSET_BITS=64 on 32bit archs.
+     - Add Compile_with_FILE_OFFSET_BITS_64_on_32-bit_Linux.patch
+     - Closes: #965046
+ 
+  -- Felix Geyer <fgeyer@debian.org>  Mon, 19 Oct 2020 16:20:14 +0200
  
  cmake (3.18.2-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge