From dcfa81f983504f35cb25c5f8f76ca073c7461c71 Mon Sep 17 00:00:00 2001 From: Mathias Gug Date: Tue, 5 Jan 2016 14:15:55 -0500 Subject: [PATCH] Add debian revision. --- cmake/CPackDebianConfig.cmake | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cmake/CPackDebianConfig.cmake b/cmake/CPackDebianConfig.cmake index 323c3fe80..88ba7767d 100644 --- a/cmake/CPackDebianConfig.cmake +++ b/cmake/CPackDebianConfig.cmake @@ -7,15 +7,13 @@ INCLUDE(FindDebArch) SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENCE.TXT") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CPACK_RESOURCE_FILE_README}") -SET(CPACK_PACKAGE_VERSION_MAJOR ${OSRM_VERSION_MAJOR}) -SET(CPACK_PACKAGE_VERSION_MINOR ${OSRM_VERSION_MINOR}) -SET(CPACK_PACKAGE_VERSION_PATCH ${OSRM_VERSION_PATCH}) - -SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") +SET(CPACK_PACKAGE_UPSTREAM_VERSION "${OSRM_VERSION_MAJOR}.${OSRM_VERSION_MINOR}.${OSRM_VERSION_PATCH}") +SET(CPACK_PACKAGE_DEBIAN_REVISION "1") +SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_UPSTREAM_VERSION-${CPACK_PACKAGE_DEBIAN_REVISION}") string(TOLOWER "${CMAKE_PROJECT_NAME}" LOWER_PROJECT_NAME) SET(CPACK_PACKAGE_FILE_NAME "${LOWER_PROJECT_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}") -SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${LOWER_PROJECT_NAME}_${CPACK_PACKAGE_VERSION}_orig") +SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${LOWER_PROJECT_NAME}_${CPACK_PACKAGE_UPSTREAM_VERSION}_orig") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Open Source Routing Machine (OSRM).") SET(CPACK_PACKAGE_DESCRIPTION "Open Source Routing Machine (OSRM) is a routing engine.") @@ -27,7 +25,7 @@ SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY "FALSE") SET(CPACK_GENERATOR "DEB") SET(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}${VERSION_SUFFIX}") -SET(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}${CPACK_PACKAGE_REVISION}") +SET(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}") SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Dennis Luxen ") SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional") SET(CPACK_DEBIAN_PACKAGE_SECTION "devel")