backtrack to stable build number, splitting off -git package for devel branch
add devel version that builds from git
conflict normal and devel packages with eachother