summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packaging/CPackDebUploadPPA.cmake5
-rw-r--r--packaging/debian/source/format2
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