diff -Nru ceres-solver-1.14.0/debian/changelog ceres-solver-1.14.0/debian/changelog --- ceres-solver-1.14.0/debian/changelog 2020-06-08 18:47:40.000000000 +0000 +++ ceres-solver-1.14.0/debian/changelog 2020-09-22 14:16:18.000000000 +0000 @@ -1,3 +1,10 @@ +ceres-solver (1.14.0-8+rpi1) bullseye-staging; urgency=medium + + * Build with gcc-9 due to symbol definition loop error with gcc-10. + * Add -f to rm command that is failing on nonexistent file. + + -- Peter Michael Green Tue, 22 Sep 2020 14:16:18 +0000 + ceres-solver (1.14.0-8) unstable; urgency=medium * Team upload. diff -Nru ceres-solver-1.14.0/debian/control ceres-solver-1.14.0/debian/control --- ceres-solver-1.14.0/debian/control 2020-06-08 18:02:55.000000000 +0000 +++ ceres-solver-1.14.0/debian/control 2020-09-22 14:16:18.000000000 +0000 @@ -16,7 +16,9 @@ libjs-jquery, libjs-mathjax, libjs-modernizr, - libjs-underscore + libjs-underscore, + gcc-9, + g++-9 Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/science-team/ceres-solver Vcs-Git: https://salsa.debian.org/science-team/ceres-solver.git diff -Nru ceres-solver-1.14.0/debian/rules ceres-solver-1.14.0/debian/rules --- ceres-solver-1.14.0/debian/rules 2020-06-08 18:02:10.000000000 +0000 +++ ceres-solver-1.14.0/debian/rules 2020-09-22 14:16:18.000000000 +0000 @@ -2,6 +2,10 @@ export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +export CC=gcc-9 +export CXX=g++-9 + include /usr/share/dpkg/default.mk build: build-arch build-indep @@ -62,7 +66,7 @@ sed -i 's/https:\/\/cdnjs.cloudflare.com\/ajax\/libs\/mathjax\/2.7.1/\/usr\/share\/javascript\/mathjax/g' $(CURDIR)/debian/tmp/usr/share/doc/ceres/html/*.html rm debian/tmp/usr/share/doc/ceres/html/_static/jquery.js ln -s /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/doc/ceres/html/_static/jquery.js - rm debian/tmp/usr/share/doc/ceres/html/_static/js/modernizr.min.js + rm -f debian/tmp/usr/share/doc/ceres/html/_static/js/modernizr.min.js ln -s /usr/share/javascript/modernizr/modernizr.min.js debian/tmp/usr/share/doc/ceres/html/_static/js/modernizr.min.js rm debian/tmp/usr/share/doc/ceres/html/_static/underscore.js ln -s /usr/share/javascript/underscore/underscore.js debian/tmp/usr/share/doc/ceres/html/_static/underscore.js