Comment 2 for bug 1658796

.bzr-builddeb is checked in. I can reproduce the problem by just branching trunk and running make sourcepackage (trusty and xenial, on my host or container). The issue is the conflicting file is checked in and not part of the orig tarball, hence the error.