From 42b1eaa2404c5cf30b9e276dca39f81273171097 Mon Sep 17 00:00:00 2001 From: Mathias Gug Date: Tue, 5 Jan 2016 11:44:24 -0500 Subject: [PATCH 1/3] Use OSRM versions for Debian package version. --- cmake/CPackDebianConfig.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/CPackDebianConfig.cmake b/cmake/CPackDebianConfig.cmake index bd434ee9e..323c3fe80 100644 --- a/cmake/CPackDebianConfig.cmake +++ b/cmake/CPackDebianConfig.cmake @@ -7,9 +7,9 @@ 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 "0") -SET(CPACK_PACKAGE_VERSION_MINOR "4") -SET(CPACK_PACKAGE_VERSION_PATCH "3") +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}") From dcfa81f983504f35cb25c5f8f76ca073c7461c71 Mon Sep 17 00:00:00 2001 From: Mathias Gug Date: Tue, 5 Jan 2016 14:15:55 -0500 Subject: [PATCH 2/3] 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") From c1709da6bf13566779060120cf07017e3d8782a0 Mon Sep 17 00:00:00 2001 From: Mathias Gug Date: Tue, 5 Jan 2016 14:25:14 -0500 Subject: [PATCH 3/3] Fix typo. --- cmake/CPackDebianConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/CPackDebianConfig.cmake b/cmake/CPackDebianConfig.cmake index 88ba7767d..84b80a6bc 100644 --- a/cmake/CPackDebianConfig.cmake +++ b/cmake/CPackDebianConfig.cmake @@ -9,7 +9,7 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENCE.TXT") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CPACK_RESOURCE_FILE_README}") 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}") +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}")