Modify architecture conditionals to add architecture names for Debian/Ubuntu
    
    The architecture names aren't *exactly* the same between RPM and dpkg,
    so we need to handle that properly here.