add philip's changes as quilt patches, remove old dpatch patches, hook quilt into...