diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2021-01-27 22:58:48 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2021-01-27 22:58:48 +0100 |
| commit | 597b79f69aa3612c52cb070ce430cddd38af7cea (patch) | |
| tree | eb726953017bb7397c2f92b372eb332da71659cd /packaging | |
| parent | 1387cbc1372eaae0c2d4309d4afd5e810419b149 (diff) | |
| parent | 06c8be4ad6384a4bef4da0c121051fcbf48ac1f3 (diff) | |
Merge remote-tracking branch 'upstream/2.3' into fdkaac-encoder3
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/CPackDebUploadPPA.cmake | 14 | ||||
| -rw-r--r-- | packaging/debian/control.in | 1 | ||||
| -rw-r--r-- | packaging/debian/mixxx.manpages | 1 | ||||
| -rwxr-xr-x | packaging/debian/rules | 9 |
4 files changed, 14 insertions, 11 deletions
diff --git a/packaging/CPackDebUploadPPA.cmake b/packaging/CPackDebUploadPPA.cmake index 7de7ff7f7e..2207be5980 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}") @@ -57,6 +62,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} +) + configure_file(${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian/control.in ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}/debian/control @ONLY) @@ -85,9 +96,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} diff --git a/packaging/debian/control.in b/packaging/debian/control.in index a701b3078b..c0cf656ba2 100644 --- a/packaging/debian/control.in +++ b/packaging/debian/control.in @@ -17,7 +17,6 @@ Build-Depends: debhelper (>= 11), # QtSql # QtWidgets # QtXml - qt5-default, qt5keychain-dev, # We additionally need headers for QtOpenGL, QtScript, and QtSvg. qtscript5-dev, diff --git a/packaging/debian/mixxx.manpages b/packaging/debian/mixxx.manpages new file mode 100644 index 0000000000..b9275ccd33 --- /dev/null +++ b/packaging/debian/mixxx.manpages @@ -0,0 +1 @@ +mixxx.1 diff --git a/packaging/debian/rules b/packaging/debian/rules index fc060e6deb..a32353631d 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -4,14 +4,9 @@ override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DINSTALL_USER_UDEV_RULES=OFF + dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DINSTALL_USER_UDEV_RULES=OFF -DKEYFINDER=OFF -override_dh_auto_build: - docbook-to-man debian/mixxx.sgml > mixxx.1 - dh_auto_build - -override_dh_install: - dh_install +override_dh_installudev: dh_installudev --name=mixxx-usb-uaccess --priority 69 %: |