Improve package generation for devel and master branches