diff -Nru qbs-1.12.1+dfsg/debian/changelog qbs-1.12.1+dfsg/debian/changelog --- qbs-1.12.1+dfsg/debian/changelog 2018-10-31 11:43:46.000000000 +0000 +++ qbs-1.12.1+dfsg/debian/changelog 2018-11-05 21:05:05.000000000 +0000 @@ -1,3 +1,14 @@ +qbs (1.12.1+dfsg-2+rpi1) buster-staging; urgency=medium + + [changes brought forward from 1.10.0+dfsg-2+rpi1 by Peter Michael Green 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. + + -- Peter Michael green Mon, 05 Nov 2018 21:05:05 +0000 + qbs (1.12.1+dfsg-2) unstable; urgency=medium * Update symbols files from buildds’ logs. diff -Nru qbs-1.12.1+dfsg/debian/rules qbs-1.12.1+dfsg/debian/rules --- qbs-1.12.1+dfsg/debian/rules 2018-10-31 11:43:46.000000000 +0000 +++ qbs-1.12.1+dfsg/debian/rules 2018-11-05 21:05:05.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=meh)/(arch=armel)/' debian/libqbsqtprofilesetup1.*.symbols + sed -i 's/(optional=meh2)/(arch=!armel)/' debian/libqbsqtprofilesetup1.*.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)/(optional=meh)/' debian/libqbsqtprofilesetup1.*.symbols + sed -i 's/(arch=!armel)/(optional=meh2)/' debian/libqbsqtprofilesetup1.*.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); \