This attached debdiff fixes the issues you pointed out. Yes, sorry it was a mistake. I generally don't use bzr to merge packages and I prefer the debdiff for the merges.
This attached debdiff fixes the issues you pointed out. Yes, sorry it was a mistake. I generally don't use bzr to merge packages and I prefer the debdiff for the merges.