switch from PkgVersion to OurPkgVersion

so line numbers in tests and release are the same as in VCS