The same patch as in the merge-proposal diff also needs to be applied in the package. Two of those three instances of the problem have already been fixed upstream though.
The same patch as in the merge-proposal diff also needs to be applied in the package. Two of those three instances of the problem have already been fixed upstream though.