Merge version 1.12.2+dfsg-1+rpi1 and 1.12.2+dfsg-2 to produce 1.12.2+dfsg-2+rpi1

diff --cc debian/changelog
index f19b71e9598f0c1504c4e8e09134c3194783f6be,fb62ea56e5433e913ce494c16031f641b6f324a7..6bd6fe9499c8ae6be2e7eb44b996e3af8972b24b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,8 +1,24 @@@
- qbs (1.12.2+dfsg-1+rpi1) buster-staging; urgency=medium
++qbs (1.12.2+dfsg-2+rpi1) buster-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++
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 16 Dec 2018 12:54:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 29 Dec 2018 10:36:48 +0000
++
+ qbs (1.12.2+dfsg-2) unstable; urgency=medium
+ 
+   * Add a patch to fix segfault with --log-level debug (closes: #917066).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 23 Dec 2018 00:32:11 +0300
  
  qbs (1.12.2+dfsg-1) unstable; urgency=medium