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 a42ce3624d56e564f4a7397841161259f60b2c73..c6e2f9bd2bdd1b1fe419b35cf693b105eb08b737 100644 (file)
--- 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\"/;}" \
            $< > $@; \