Use r2/ (instead of r2-beta3/) also in current-testing and unstable.
Use separate repositories for different dom0 base distributions. This is basically to ease upgrades, not to support different base distro simultaneously.