Merge version 1.18.0-4+rpi1 and 1.18.0-5 to produce 1.18.0-5+rpi1

diff --cc debian/changelog
index eba582f9470cd1af2505962ecf698bdfa3155dcb,ace7d22d8fd1a997a060cb55e4313d6a1782ab51..35e24b4be1ed5921faad229a261217d76edf4a31
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,8 +1,27 @@@
- qbs (1.18.0-4+rpi1) bullseye-staging; urgency=medium
++qbs (1.18.0-5+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.10.0+dfsg-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 06 Feb 2018 00:27:38 +0000]
 +  * Add symbols file hack for Raspbian.
 +  * Fix clean target.
 +
 +  [changes introduced in 1.12.1+dfsg-2+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
 +  [changes introduced in 1.12.2+dfsg-1+rpi1 by Peter Michael Green]
 +  * Mark another symbol as optional. I'm guessing the presence or absesne of
 +    this one depends on optimisation descisions by the compiler and/or the
 +    version of libstdc++
 +
 +  [changes introduced in 1.13.1-2+rpi1 by Peter Michael Green]
 +  * Extend symbols file hack.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Feb 2021 09:22:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Apr 2021 13:29:07 +0000
++
+ qbs (1.18.0-5) unstable; urgency=medium
+ 
+   * Handle symlink to directory change in qbs-examples (closes: #985295).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 15 Mar 2021 21:02:24 +0300
  
  qbs (1.18.0-4) unstable; urgency=medium