From 9c40164e6c2103a4f49904f31bd3d6c5168fff95 Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Wed, 11 Jun 2014 13:24:07 +0200 Subject: [PATCH] Debian: update updateversion tool to handle pre-release tags. Refs #5816 --- debian/updateversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/updateversion b/debian/updateversion index b9b0c30db..732bbef0b 100755 --- a/debian/updateversion +++ b/debian/updateversion @@ -7,7 +7,7 @@ set -e set -x #VERSION=$(grep -E "^Version:" icinga2.spec | cut -d" " -f2) -VERSION=`git describe | sed 's/^v//' | grep -oP "^\d+\.\d+\.\d+"` +VERSION=`git describe --abbrev=0 | sed 's/^v//' | grep -oP "^\d+\.\d+\.\d+(-.*)?" | sed 's/-/~/'` DEB_VERSION_SUFFIX=$(echo "+icingasnap"`date +%Y%m%d%H%M`"."`git rev-parse --short HEAD`) # update Debian version