split up modifications of reverted commit

Here is that commit split up a bit
the deb stuff is in deb.xml now, vs. being mixed in with rpm.xml