Your adjusted patch drops the test for the bug and NEWS entries. Not a huge deal but it might be better to keep the divergence minimal.
Alternatively it might be simpler and better to package the current lp:bzr/2.1 branch. The final 2.1.2 is likely to be very close the current state of that branch, and it has other valuable fixes (e.g. #559436 and #556940) apart from just this one.
Your adjusted patch drops the test for the bug and NEWS entries. Not a huge deal but it might be better to keep the divergence minimal.
Alternatively it might be simpler and better to package the current lp:bzr/2.1 branch. The final 2.1.2 is likely to be very close the current state of that branch, and it has other valuable fixes (e.g. #559436 and #556940) apart from just this one.