Pre-upstream-proposal cosmetics
Fix package versions, bump source packages