Keep userspace packaging in sync; update srcdiff to grok moved dmapi source.