Improve package building

RPMs and debs now build.