diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2020-12-11 01:48:17 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2020-12-11 08:01:30 +0100 |
| commit | 437a23bc1a75390a566456bb72a5fc9b5b1a04db (patch) | |
| tree | 37e0007cb8bce8a795478336c08095423d85c3c9 | |
| parent | 318a3025d47e6022b23455327a4205d9ea8c4376 (diff) | |
Make compatible to scons solution
| -rw-r--r-- | packaging/CPackDebUploadPPA.cmake | 5 | ||||
| -rw-r--r-- | packaging/debian/source/format | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/packaging/CPackDebUploadPPA.cmake b/packaging/CPackDebUploadPPA.cmake index d877349220..f1c6e09f95 100644 --- a/packaging/CPackDebUploadPPA.cmake +++ b/packaging/CPackDebUploadPPA.cmake @@ -24,6 +24,11 @@ if(NOT CPACK_DEBIAN_MARKDOWN) message(FATAL_ERROR "markdown not found, required for cpack -G External -D DEB_UPLOAD_PPA=true") endif() +# hack from sconscript +#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() message(NOTICE "Creating mixxx_${CPACK_DEBIAN_UPSTREAM_VERSION}.orig.tar.gz") execute_process( diff --git a/packaging/debian/source/format b/packaging/debian/source/format index 163aaf8d82..d3827e75a5 100644 --- a/packaging/debian/source/format +++ b/packaging/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +1.0 |