[Pkg-javascript-commits] [sockjs-client] 74/434: Apparently, the versioning is used in completely different way

[Tonnerre Lombard]

This is an automated email from the git hooks/post-receive script.

tonnerre-guest pushed a commit to branch master
in repository sockjs-client.

commit b77f063b123f119b9d69af996e291fede39c13e5
Author: Marek Majkowski <majek04 at gmail.com>
Date:   Thu Aug 11 16:40:06 2011 +0100

    Apparently, the versioning is used in completely different way
---
 VERSION-GEN | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/VERSION-GEN b/VERSION-GEN
index 8c3eeb3..8369817 100755
--- a/VERSION-GEN
+++ b/VERSION-GEN
@@ -1,17 +1,11 @@
 #!/bin/sh
 
-DEF_VER=unknown
-
 LF='
 '
 
-# First see if there is a version file (included in release tarballs),
-# then try git-describe, then default.
-if test -f version
-then
-	VN=$(cat version) || VN="$DEF_VER"
-elif test -d .git -o -f .git &&
-	VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
+VN=$(cat version)
+
+if VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
 	case "$VN" in
 	*$LF*) (exit 1) ;;
 	v[0-9]*)
@@ -20,11 +14,8 @@ elif test -d .git -o -f .git &&
 		VN="$VN-dirty" ;;
 	esac
 then
-	VN=$(echo "$VN" | sed -e 's/-/./g');
-else
-	VN="$DEF_VER"
+    VN=$(echo "$VN" | sed -e 's/-/./g');
 fi
-
 VN=$(expr "$VN" : v*'\(.*\)')
 
 echo "$VN"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/sockjs-client.git