From 8141f8527435e86f47bd89c797a3811aa99cb840 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Wed, 6 Nov 2013 11:55:19 +0100 Subject: improve package file naming --- CMakeLists.txt | 4 ++-- package.sh.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e7e6c47..0d1966c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,8 +27,8 @@ set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "http://ufo.kit.edu/ufo/newticket") set(CPACK_GENERATOR "DEB;RPM") -set(CPACK_PACKAGE_RELEASE 3) -set(CPACK_RPM_PACKAGE_RELEASE 3) +set(CPACK_PACKAGE_RELEASE 1) +set(CPACK_RPM_PACKAGE_RELEASE ${CPACK_PACKAGE_RELEASE}) set(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Matthias Vogelgesang ") set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${UCA_DESCRIPTION}) diff --git a/package.sh.in b/package.sh.in index f20e7c1..4bece35 100644 --- a/package.sh.in +++ b/package.sh.in @@ -1,6 +1,6 @@ HEADERS_POSTFIX="devel" PROGRAMS_POSTFIX="tools" -PACKAGE_VERSION="${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}" +PACKAGE_VERSION="${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}-${CPACK_PACKAGE_RELEASE}" cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;executables;/" -D CPACK_PACKAGE_NAME="${CPACK_PACKAGE_NAME}-$PROGRAMS_POSTFIX" -D CPACK_PACKAGE_FILE_NAME="${CPACK_PACKAGE_NAME}-$PACKAGE_VERSION-$PROGRAMS_POSTFIX" -- cgit v1.2.3