From 1e8675117e59c9f1d19cb6ae6aee76ea06ebaa20 Mon Sep 17 00:00:00 2001 Message-Id: <1e8675117e59c9f1d19cb6ae6aee76ea06ebaa20.1716869764.git.mdw@distorted.org.uk> From: Mark Wooding Date: Tue, 21 May 2024 14:29:26 +0100 Subject: [PATCH] auto-version.in: Don't scramble the version number (regression fix). Organization: Straylight/Edgeware From: Mark Wooding If both Git and Debian versions are available, then only glue the two together if the Debian version ends with `~'. --- auto-version.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto-version.in b/auto-version.in index c7d5925..007da8b 100755 --- a/auto-version.in +++ b/auto-version.in @@ -85,7 +85,7 @@ fi ## version-comparison algorithm which specifies this behaviour, so one must ## be careful when choosing `~' prefixes. if [ -e .git ] && version=$(git describe --abbrev=4 --dirty=+ 2>/dev/null); then - case ${debver+t} in t) version=$debver$version ;; esac + case ${debver-nil} in *~) version=$debver$version ;; esac echo "$version" exit 0 fi -- [mdw]