diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2021-02-22 23:45:30 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2021-02-22 23:45:30 +0100 |
commit | 1728d13dd2aa6631983342b8183245eca54098aa (patch) | |
tree | cba635c6b6b22e8d65dcf473af37b74d3e5c8294 /packaging/CPackDebUploadPPA.cmake | |
parent | ddd8ed67486813359c8ae4a357863f66d6156be4 (diff) | |
parent | f102585cab5531c875a9ca6623b16196c612b31f (diff) |
Merge remote-tracking branch 'upstream/2.3' into ppa_m4a
Diffstat (limited to 'packaging/CPackDebUploadPPA.cmake')
-rw-r--r-- | packaging/CPackDebUploadPPA.cmake | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/packaging/CPackDebUploadPPA.cmake b/packaging/CPackDebUploadPPA.cmake index 3263e4e03c..06cf881f3f 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() +find_program(CPACK_DEBIAN_DOCBOOK_TO_MAN docbook-to-man) +if(NOT CPACK_DEBIAN_DOCBOOK_TO_MAN) + message(FATAL_ERROR "docbook-to-man 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}") @@ -58,6 +63,12 @@ execute_process( WORKING_DIRECTORY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian ) +execute_process( + COMMAND ${CPACK_DEBIAN_DOCBOOK_TO_MAN} debian/mixxx.sgml + OUTPUT_FILE mixxx.1 + WORKING_DIRECTORY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} +) + file(COPY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/res/linux/mixxx-usb-uaccess.rules DESTINATION ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian) file(RENAME @@ -91,9 +102,6 @@ foreach(RELEASE ${CPACK_DEBIAN_DISTRIBUTION_RELEASES}) execute_process(COMMAND ${CPACK_DEBIAN_DEBCHANGE} -r -D ${RELEASE} -M "Build of ${CPACK_DEBIAN_UPSTREAM_VERSION}" WORKING_DIRECTORY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}) - if (BUILD_MACHINE_RELEASE STREQUAL RELEASE AND DEB_BUILD) - set(CPACK_DEBIAN_DEBUILD_BUILD "-b") - endif() if (DEB_UPLOAD_PPA OR DEB_SOURCEPKG) execute_process(COMMAND ${CPACK_DEBIAN_DEBUILD} -S -sa -d ${CPACK_DEBIAN_DEBUILD_NOSIGN} WORKING_DIRECTORY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} |