I actually think the --install-layout=deb changes isn't necessary either. Binary package contents end up the same with or without it.
BTW, I see you haven't uploaded the change yet. Any chance you could do that so it will be easier for us to merge the change back into Ubuntu? Thanks!
signature.asc
Description: PGP signature
