Comment 11 for bug 929164

I've pushed up the offending branches as +junk branches so they will stay frozen in time:

lp:~clint-fewbar/+junk/cyrus-sasl2-builddeb
lp:~clint-fewbar/+junk/debian-curys-sasl2-builddeb

Merging the debian into the non-debian one results in the bug manifesting. To progress from there I did this:

<manually resolve conflicts>
bzr resolved
bzr rm
quilt push -a
bzr add
debcommit

That resulted in a packaging branch that was in the "applied" state, and builds properly with bzr bd.

The cyrus-sasl2 package will be synced now, so the best way to continue reproducing the problem will be those two junk branches.