puavo-dch: include the optional upstream version prefix in the final version number