Merge branch 'master' into next

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 72201be57c633259e65b435f8623a80e4cdc3e88..d2200acd7aca5172c386e374b95775838658ab68 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,14 +1,17 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.1.GIT
+DEF_VER=v1.3-rc2.GIT
 
 # First try git-describe, then see if there is a version file
 # (included in release tarballs), then default
 if VN=$(git-describe --abbrev=4 HEAD 2>/dev/null); then
        VN=$(echo "$VN" | sed -e 's/-/./g');
-else
+elif test -f version
+then
        VN=$(cat version) || VN="$DEF_VER"
+else
+       VN="$DEF_VER"
 fi
 
 VN=$(expr "$VN" : v*'\(.*\)')