The deb conflict could be solved rather neatly by using dpkg diversions: http://www.debian.org/doc/debian-policy/ap-pkg-diversions.ht...