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

diff --cc debian/changelog
index 6e4c5a177065093416525c070d1119c04b5db1fb,71877f1f89360506c31d578cc3652034f8a7e800..c7ff37594f10033ccd1a187bcf63d13c1829ea32
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- cmake (3.18.4-2+rpi1) bullseye-staging; urgency=medium
++cmake (3.18.4-2+rpi1+deb11u1) 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>  Wed, 10 Feb 2021 12:52:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Dec 2021 17:50:33 +0000
++
+ cmake (3.18.4-2+deb11u1) bullseye; urgency=medium
+ 
+   * Team upload.
+   * Add PostgreSQL 13 to known versions (Closes: #990623)
+ 
+  -- Timo Röhling <roehling@debian.org>  Tue, 14 Sep 2021 00:08:52 +0200
  
  cmake (3.18.4-2) unstable; urgency=medium