From 290f9a4e182a7c7a89765e58c9ba477be4fc4732 Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Sun, 19 Apr 2020 22:16:08 +0200 Subject: [PATCH] posaune --- debian/mbuild.changelog | 1 + tools/make/mconfigure | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian/mbuild.changelog b/debian/mbuild.changelog index 134afe9..67fcbc7 100644 --- a/debian/mbuild.changelog +++ b/debian/mbuild.changelog @@ -1,5 +1,6 @@ projects (0.5-%BUILD%) unstable; urgency=medium * mconfigure -o for Debian 7 downward compatibility + * works with multiple git tags on the same commit -- Michael Wagner Thu, 11 Apr 2019 22:54:48 +0100 projects (0.4-%BUILD%) unstable; urgency=medium diff --git a/tools/make/mconfigure b/tools/make/mconfigure index c551c41..a1ea508 100755 --- a/tools/make/mconfigure +++ b/tools/make/mconfigure @@ -36,16 +36,11 @@ function set_build { build="$build$(check_unversioned)" elif [ -e .git ] then - tag=$(git describe --tags 2>/dev/null) || true + tag=$(git describe --tags --match "${paket}_*" 2>/dev/null) || true if test -z "$tag" then tag="0.0-0TOP" fi - tag_paket=${tag%_*} - if [ "$tag_paket" != "$paket" ] - then - tag="0.0-0TOP" - fi changes=$(check_unversioned) tag="$tag$changes" version=${tag%-*} -- 2.20.1