From 5651c039207696aef8d6898846aa0efc9d582e78 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 23 Jun 2009 16:27:38 +0200
Subject: build-sys: drop compat with old git versions so that tarballs for
 -test1 style evrsions are properly created

---
 git-version-gen | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'git-version-gen')

diff --git a/git-version-gen b/git-version-gen
index 710870cd..bb99c3a8 100755
--- a/git-version-gen
+++ b/git-version-gen
@@ -106,18 +106,18 @@ then
     # tag or the previous older version that did not?
     #   Newer: v6.10-77-g0f8faeb
     #   Older: v6.10-g0f8faeb
-    case $v in
-	*-*-*) : git describe is okay three part flavor ;;
-	*-*)
-	    : git describe is older two part flavor
-	    # Recreate the number of commits and rewrite such that the
-	    # result is the same as if we were using the newer version
-	    # of git describe.
-	    vtag=`echo "$v" | sed 's/-.*//'`
-	    numcommits=`git rev-list "$vtag"..HEAD | wc -l`
-	    v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
-	    ;;
-    esac
+#    case $v in
+#	*-*-*) : git describe is okay three part flavor ;;
+#	*-*)
+#	    : git describe is older two part flavor
+#	    # Recreate the number of commits and rewrite such that the
+#	    # result is the same as if we were using the newer version
+#	    # of git describe.
+#	    vtag=`echo "$v" | sed 's/-.*//'`
+#	    numcommits=`git rev-list "$vtag"..HEAD | wc -l`
+#	    v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
+#	    ;;
+#    esac
 
     # Change the first '-' to a '.', so version-comparing tools work properly.
     # Remove the "g" in git describe's output string, to save a byte.
-- 
cgit 


From b4b1f0375ca96c0813de5fc3c68feb052d4c2895 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 23 Jun 2009 17:13:29 +0200
Subject: build-sys: teacch git versioning script to not kill - in version
 strings

---
 git-version-gen | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'git-version-gen')

diff --git a/git-version-gen b/git-version-gen
index bb99c3a8..ae3988ea 100755
--- a/git-version-gen
+++ b/git-version-gen
@@ -121,7 +121,8 @@ then
 
     # Change the first '-' to a '.', so version-comparing tools work properly.
     # Remove the "g" in git describe's output string, to save a byte.
-    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+#    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+    :
 else
     v=UNKNOWN
 fi
-- 
cgit