[dahdi-commits] dahdi/linux.git branch "2.6.y" updated.

[SVN commits to the DAHDI project]

branch "2.6.y" has been updated
       via  ae8a02168ba6c9ba5b17ad886a899c664c1b9a3d (commit)
      from  2a5638deef0ac2381181f143c8bcda0cdf1c0751 (commit)

Summary of changes:
 build_tools/make_version |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit ae8a02168ba6c9ba5b17ad886a899c664c1b9a3d
Author: Shaun Ruffell <sruffell at digium.com>
Date:   Fri Mar 8 11:28:11 2013 -0600

    build_tools/make_version: Strip off the leading 'v' in the version string.
    
    Quote: "It's a change. People hate change"
    
    Make the version string say something like 2.6.2 instead of v2.6.2.
    
    Signed-off-by: Shaun Ruffell <sruffell at digium.com>
    (cherry picked from commit 9b0d19c05449071c40827efbb0b0a5b302da435f)

diff --git a/build_tools/make_version b/build_tools/make_version
index d06a6bc..f880ad6 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -59,7 +59,7 @@ elif [ -d ${1}/.git ]; then
     MODIFIED=""
     SVN_REV=`git log --pretty=full -1 | grep -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
     if [ -z "$SVN_REV" ]; then
-        VERSION=`git describe --tags --dirty=M 2> /dev/null`
+        VERSION=`git describe --tags --dirty=M 2> /dev/null | sed -e "s/^v//"`
         if [ $? -ne 0 ]; then
             if [ "`git ls-files -m | wc -l`" != "0" ]; then
                 MODIFIED="M"

-----------------------------------------------------------------------


-- 
dahdi/linux.git