From: Brian J. Murrell <brian.murrell@oracle.com>
Date: Mon, 18 Oct 2010 18:10:50 +0000 (-0400)
Subject: need to match both master and b1_8 style tags
X-Git-Tag: 2.0.54.0~22
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6070c572e8f93997edcdcacb6680a25a83b6d790;ds=sidebyside

need to match both master and b1_8 style tags
---

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 5ed02a7..9806d8d 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -148,7 +148,7 @@ debs:
 		echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n  * Automated changelog entry update\n\n -- Brian J. Murrell <brian@interlinx.bc.ca>  $$(date -R)\n\n.\nwq" | ed debian/changelog; \
 	fi; \
 	if [ -d .git ]; then \
-		ver=$$(git describe --match v\* --tags); \
+		ver=$$(git describe --match [0-9v]\* --tags); \
 		if [[ $$ver = *-*-* ]]; then \
 			hash=$${ver##*-}; \
 			ffw=$${ver#*-}; \