posaune

diff --git a/debian/mbuild.changelog b/debian/mbuild.changelog
index 134afe976314f209af21a0c3f0a51b60a9745b26..67fcbc7e1188d2ec352e13d0ccd70de92342043a 100644 (file)
--- 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
 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 <michael@wagnertech.de>  Thu, 11 Apr 2019 22:54:48 +0100
 
 projects (0.4-%BUILD%) unstable; urgency=medium
  -- Michael Wagner <michael@wagnertech.de>  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 c551c41ca4e58aee19cc2f6005160d925b00a58f..a1ea5085b1aa0763f10409f2aed8c995a64e1b7c 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -36,16 +36,11 @@ function set_build {
                build="$build$(check_unversioned)"
        elif [ -e .git ]
        then
                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
                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%-*}
                changes=$(check_unversioned)
                tag="$tag$changes"
                version=${tag%-*}