diff --git a/packaging/CPackDebUploadPPA.cmake b/packaging/CPackDebUploadPPA.cmake index 0f7e65b3507..1d951ea5d75 100644 --- a/packaging/CPackDebUploadPPA.cmake +++ b/packaging/CPackDebUploadPPA.cmake @@ -25,11 +25,16 @@ if(NOT CPACK_DEBIAN_MARKDOWN) endif() # hack from sconscript -if(DEB_UPLOAD_PPA MATCHES "mixxxbetas" OR DEB_UPLOAD_PPA MATCHES "nightlies") +if(DEB_UPLOAD_PPA MATCHES "mixxxbetas") string(REGEX MATCH "^.*(~git[0-9]*).*$" GITVERSION "${CPACK_DEBIAN_DEBIAN_VERSION_EXTRA}") set(CPACK_DEBIAN_UPSTREAM_VERSION "${CPACK_DEBIAN_UPSTREAM_VERSION}${CMAKE_MATCH_1}") endif() +if(DEB_UPLOAD_PPA MATCHES "nightlies") + string(REGEX MATCH "^.*(~git[0-9]*).*$" GITVERSION "${CPACK_DEBIAN_DEBIAN_VERSION_EXTRA}") + set(CPACK_DEBIAN_UPSTREAM_VERSION "${CPACK_DEBIAN_UPSTREAM_VERSION}1${CMAKE_MATCH_1}") +endif() + # PR branches hav no access to the pgp key. Don't sign. find_program(CPACK_DEBIAN_GPG gpg) if(CPACK_DEBIAN_GPG)