Merge version 1.11.0+dfsg-1+rpi1 and 1.11.1+dfsg-2 to produce 1.11.1+dfsg-2+rpi1

diff --cc debian/changelog
index 46d020639a41f4f386062be7b4995f4665674e11,ee9880822da26e079c6ade2916c732d97f832fef..4b9cc692862279a68721eda7d328fe0e7bd1a449
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,22 +1,30 @@@
- qbs (1.11.0+dfsg-1+rpi1) buster-staging; urgency=medium
++qbs (1.11.1+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 17 Apr 2018 04:15:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 21 May 2018 05:11:11 +0000
++
+ qbs (1.11.1+dfsg-2) unstable; urgency=medium
+ 
+   * Fix architecture independent builds.
+   * Update libqbsqtprofilesetup1.11.symbols from buildds’ logs.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 14 May 2018 23:18:21 +0300
+ 
+ qbs (1.11.1+dfsg-1) unstable; urgency=medium
+ 
+   [ Simon Quigley ]
+   * New upstream release.
+   * Bump Standards-version to 4.1.4, no changes needed.
+   * Update patches for new upstream release and remove reverse-
+     applicable installed_headers.diff.
+ 
+   [ Dmitry Shachnev ]
+   * Update symbols files from buildds’ logs.
+ 
+  -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 12 May 2018 20:00:45 -0500
  
  qbs (1.11.0+dfsg-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge