From caaf36a2798b9ecd7d636315a5957df34a7dbe92 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Mon, 7 Sep 2020 14:47:54 +0300 Subject: [PATCH 1/2] Add MAXSCALE_BUILD_NUMBER to the debian/control version --- cmake/package_deb.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cmake/package_deb.cmake b/cmake/package_deb.cmake index c9bd4acae..34720de66 100644 --- a/cmake/package_deb.cmake +++ b/cmake/package_deb.cmake @@ -4,11 +4,8 @@ execute_process(COMMAND lsb_release -cs OUTPUT_VARIABLE DEB_CODENAME OUTPUT_STRI execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE DEB_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE) set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEB_ARCHITECTURE}) set(CPACK_DEBIAN_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}") -set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}~${DEB_CODENAME}") +set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${MAXSCALE_BUILD_NUMBER}~${DEB_CODENAME}") set(CPACK_DEBIAN_PACKAGE_RELEASE "${DEB_CODENAME}") -message(STATUS "CPACK_DEBIAN_PACKAGE_VERSION ${CPACK_DEBIAN_PACKAGE_VERSION}") -message(STATUS "DEB_CODENAME ${DEB_CODENAME}") -message(STATUS "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") if(TARGET_COMPONENT STREQUAL "core" OR TARGET_COMPONENT STREQUAL "all") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) From ea1d7ba33bf673b3fd35c33fe133e3a67e657043 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Mon, 7 Sep 2020 15:48:11 +0300 Subject: [PATCH 2/2] Fix CPACK_DEBIAN_PACKAGE_RELEASE field --- cmake/package_deb.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/package_deb.cmake b/cmake/package_deb.cmake index 34720de66..9f768e3e5 100644 --- a/cmake/package_deb.cmake +++ b/cmake/package_deb.cmake @@ -5,7 +5,7 @@ execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE DEB_ARCHITECTU set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEB_ARCHITECTURE}) set(CPACK_DEBIAN_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}") set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${MAXSCALE_BUILD_NUMBER}~${DEB_CODENAME}") -set(CPACK_DEBIAN_PACKAGE_RELEASE "${DEB_CODENAME}") +set(CPACK_DEBIAN_PACKAGE_RELEASE "${MAXSCALE_BUILD_NUMBER}") if(TARGET_COMPONENT STREQUAL "core" OR TARGET_COMPONENT STREQUAL "all") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)