diff --git a/ci/packaging/debian/changelog.template b/ci/packaging/debian/changelog.template index 666263a7f3..b7b5342d69 100644 --- a/ci/packaging/debian/changelog.template +++ b/ci/packaging/debian/changelog.template @@ -1,4 +1,4 @@ -${PACKAGE} (${VERSION}-1) stable; urgency=medium +${PACKAGE} (${VERSION}) stable; urgency=medium ${RELEASE_NOTES} diff --git a/ci/packaging/scopy-deb-build.sh b/ci/packaging/scopy-deb-build.sh index 50ab69db16..28baed571e 100755 --- a/ci/packaging/scopy-deb-build.sh +++ b/ci/packaging/scopy-deb-build.sh @@ -28,8 +28,8 @@ REPO_ROOT=$(git -C "${SCRIPT_DIR}" rev-parse --show-toplevel) PROJECT_VERSION=$(grep -oP 'project\(scopy VERSION \K[0-9.]+' "${REPO_ROOT}/CMakeLists.txt") RELEASE_PHASE=$(grep -oP 'set\(SCOPY_RELEASE_PHASE \K[^)]+' "${REPO_ROOT}/CMakeLists.txt" || true) [ "${RELEASE_PHASE}" == "\"\"" ] && unset RELEASE_PHASE # if RELEASE_PHASE contains an empty string (only quotes) set it to null -VERSION="${PROJECT_VERSION}${RELEASE_PHASE}" -RELEASE="v${VERSION}" +VERSION="${PROJECT_VERSION}${RELEASE_PHASE/-/\~}" # ${parameter/pattern/string} replace "-" with "~" +RELEASE="v${PROJECT_VERSION}-1${RELEASE_PHASE}" echo "Scopy version: ${VERSION}"