imported dmapd spec from f19
Merge branch 'upstreams'
*this* seems to be what dmapd needs to build (does it run?)