diff -Nru qbs-1.16.0/debian/changelog qbs-1.16.0/debian/changelog
--- qbs-1.16.0/debian/changelog	2020-06-25 08:00:39.000000000 +0000
+++ qbs-1.16.0/debian/changelog	2020-07-03 20:17:43.000000000 +0000
@@ -1,3 +1,22 @@
+qbs (1.16.0-2+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, 03 Jul 2020 20:17:43 +0000
+
 qbs (1.16.0-2) unstable; urgency=medium
 
   * Update debian/libqbscore1.16.symbols from buildds’ logs.
diff -Nru qbs-1.16.0/debian/libqbscore1.16.symbols qbs-1.16.0/debian/libqbscore1.16.symbols
--- qbs-1.16.0/debian/libqbscore1.16.symbols	2020-06-25 08:00:39.000000000 +0000
+++ qbs-1.16.0/debian/libqbscore1.16.symbols	2020-07-03 20:17:43.000000000 +0000
@@ -1822,7 +1822,7 @@
  (optional=templinst)_ZZNKSt8__detail11_AnyMatcherINSt7__cxx1112regex_traitsIcEELb0ELb1ELb1EEclEcE5__nul@Base 1.10.0
  (optional=templinst)_ZZNKSt8__detail9_ExecutorIN9__gnu_cxx17__normal_iteratorIPKcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEESaINS5_9sub_matchISB_EEENS5_12regex_traitsIcEELb0EE10_M_is_wordEcE3__s@Base 1.10.0
  (optional=templinst)_ZZNKSt8__detail9_ExecutorIN9__gnu_cxx17__normal_iteratorIPKcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEESaINS5_9sub_matchISB_EEENS5_12regex_traitsIcEELb1EE10_M_is_wordEcE3__s@Base 1.10.0
- _ZZNSt19_Sp_make_shared_tag5_S_tiEvE5__tag@Base 1.12.2
+ (optional=disappeardinraspbian)_ZZNSt19_Sp_make_shared_tag5_S_tiEvE5__tag@Base 1.12.2
  _ZZZN3qbs7Profile12fallbackNameEvENKUlvE_clEvE15qstring_literal@Base 1.13.0
  (c++)"non-virtual thunk to qbs::Internal::Artifact::accept(qbs::Internal::BuildGraphVisitor*)@Base" 1.10.0
  (c++)"non-virtual thunk to qbs::Internal::Artifact::load(qbs::Internal::PersistentPool&)@Base" 1.10.0
diff -Nru qbs-1.16.0/debian/rules qbs-1.16.0/debian/rules
--- qbs-1.16.0/debian/rules	2020-06-25 08:00:39.000000000 +0000
+++ qbs-1.16.0/debian/rules	2020-07-03 20:17:43.000000000 +0000
@@ -18,8 +18,17 @@
 	rm -rfv doc/html $(TMP_HOME_DIR) tests/auto/*/testWorkDir lib
 	rm -fv doc/qbs.qch bin/qbs* bin/tst*
 	find . -type f -name .gitignore -delete -print
+	sed -i 's/(optional=meh)/(arch=armel)/' debian/libqbscore1.*.symbols
+	sed -i 's/(optional=meh2)/(arch=!armel)/' debian/libqbscore1.*.symbols
+	sed -i 's/(optional=meh3)/(arch=armel riscv64)/' debian/libqbscore1.*.symbols
+	sed -i 's/(optional=meh4)/(arch=!armel !riscv64)/' debian/libqbscore1.*.symbols
+	rm -rf doc/qbs
 
 override_dh_auto_configure:
+	sed -i 's/(arch=armel)/(optional=meh)/' debian/libqbscore1.*.symbols
+	sed -i 's/(arch=!armel)/(optional=meh2)/' debian/libqbscore1.*.symbols
+	sed -i 's/(arch=armel riscv64)/(optional=meh3)/' debian/libqbscore1.*.symbols
+	sed -i 's/(arch=!armel !riscv64)/(optional=meh4)/' debian/libqbscore1.*.symbols
 	dh_auto_configure -- qbs.pro \
 		CONFIG+=debug \
 		CONFIG+=qbs_disable_rpath \
@@ -41,7 +50,7 @@
 	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp sub-static-res-pro-install_subtargets
 
 override_dh_auto_test-arch:
-ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),testsuitedisabled)
 	set -ex; \
 		export LD_LIBRARY_PATH=$(CURDIR)/lib/${DEB_HOST_MULTIARCH}:$$LD_LIBRARY_PATH; \
 		export HOME=$(TMP_HOME_DIR); \