From: Travis Cross <tc@traviscross.com>
Date: Sat, 9 Feb 2013 09:48:52 +0000 (+0000)
Subject: Use format +git:XXXXXXXX
X-Git-Tag: v0.84~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efd76a7ee72d4dfb3be2cddbdceb794f2f13c7f1;p=thirdparty%2Fmtr.git

Use format +git:XXXXXXXX

The colon is kinder to Debian than a dash and seems stylistically
better.  The dash feels as though it introduces another version level,
e.g. -rc1-alpha2.  We could just do +gitXXXXXXXX but as git commit
hashes are in lowercase hexadecimal the result can be something really
ugly like +giteaf0cb71.  It's also easier to select the commit hash
for a copy/paste operation when there is something to separate it.
---

diff --git a/Makefile.am b/Makefile.am
index a42ce36..c6e2f9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ BUILT_SOURCES = version.h
 version.h: version.h.tmp Makefile $(mtr_SOURCES)
 	@cat $< > $@; \
 	if [ -d .git ] && [ -n "$$(which git)" ]; then \
-	  xver="+git-$$(git rev-list -n1 --abbrev=8 --abbrev-commit HEAD)"; \
+	  xver="+git:$$(git rev-list -n1 --abbrev=8 --abbrev-commit HEAD)"; \
 	  sed \
 	    -e "/#define *MTR_VERSION */{s/\"\([^\"]*\)\"/\"\1$$xver\"/;}" \
 	    $< > $@; \