From: Sami Kerola <sami.kerola@tomtom.com>
Date: Tue, 5 Apr 2011 11:30:50 +0000 (+0200)
Subject: build-sys: git describe listed wrong tag
X-Git-Tag: v2.15~5
X-Git-Url: http://git.asbjorn.biz/?p=debian%2Fdhcpd-pools.git;a=commitdiff_plain;h=d75927df39c91108af603fd92dddf2393f87214e

build-sys: git describe listed wrong tag

The tag v2.14 was probably done without -a option so it was not
recogniced by git describe. To over come this I found easiest to add
--tag to git-version-gen. This change should be reverted after a
release.

Signed-off-by: Sami Kerola <sami.kerola@tomtom.com>
---

diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 686f703..0b7655e 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -103,8 +103,8 @@ then
 # directory, and "git describe" output looks sensible, use that to
 # derive a version string.
 elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
-    && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
-          || git describe --abbrev=4 HEAD 2>/dev/null` \
+    && v=`git describe --tags --abbrev=4 --match='v*' HEAD 2>/dev/null \
+          || git describe --tags --abbrev=4 HEAD 2>/dev/null` \
     && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
     && case $v in
          v[0-9]*) ;;