Much work towards bug #7702.  I now just need to set up the debs.