Merge version 1.10.0+dfsg-2+rpi1 and 1.10.1+dfsg-1 to produce 1.10.1+dfsg-1+rpi1

diff --cc debian/changelog
index b1fc1844e36cd58a598ca7dab59a8186f99ba2c0,638cf948bdc3c3c82dc1442eaed9b0aa2c555d1f..e9c54aa557072a123a813fd4d4d61359342f4d3d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,29 @@@
- qbs (1.10.0+dfsg-2+rpi1) buster-staging; urgency=medium
++qbs (1.10.1+dfsg-1+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 06 Feb 2018 00:27:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 05 Apr 2018 16:06:40 +0000
++
+ qbs (1.10.1+dfsg-1) unstable; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * Properly support DEB_BUILD_OPTIONS=nocheck (closes: #886656). Thanks to
+     Helmut Grohne.
+ 
+   [ Simon Quigley ]
+   * New upstream release.
+   * Bump Standards-version to 4.1.3, no changes needed.
+   * Bump debhelper compat to 11:
+     - Remove --parallel from debian/rules because it is already used by default.
+     - No other changes were required.
+   * Update Vcs-* to reflect the move to Salsa.
+   * Follow the hints given by the multiarch hinter.
+   * Update qbs-common.install for the new upstream release.
+   * Update symbols from build logs.
+ 
+  -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 15 Mar 2018 18:05:03 -0500
  
  qbs (1.10.0+dfsg-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge