[Xfce4-commits] <xfdesktop:master> update revision substitution for git

[Brian J. Tarricone]

Updating branch refs/heads/master
         to cedac57ab491e95ef6771e1fe547ff227127048f (commit)
       from fd8929887a79fbe828ff524c6414a98eb82532d8 (commit)

commit cedac57ab491e95ef6771e1fe547ff227127048f
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Tue Aug 18 17:30:23 2009 -0700

    update revision substitution for git

 autogen.sh      |   13 +++++--------
 configure.ac.in |   10 +++++-----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 1b56feb..5e6fb0d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,15 +29,12 @@ EOF
 
 # substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
-if [ -d .git/svn ]; then
-  revision=$(git svn find-rev origin/trunk 2>/dev/null ||
-             git svn find-rev trunk 2>/dev/null ||
-             git svn find-rev HEAD 2>/dev/null ||
-             git svn find-rev master 2>/dev/null)
-else
-  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+if [ -d .git ]; then
+  revision=$(git rev-parse --short HEAD)
+fi
+if [ -z "$revision" ]; then
+  revision=UNKNOWN
 fi
-[ "$revision" ] || revision=UNKNOWN
 
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
diff --git a/configure.ac.in b/configure.ac.in
index 4760f54..ac78934 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -5,12 +5,12 @@ dnl
 
 dnl version info
 m4_define([xfdesktop_version_major], [4])
-m4_define([xfdesktop_version_minor], [6])
-m4_define([xfdesktop_version_micro], [1])
+m4_define([xfdesktop_version_minor], [7])
+m4_define([xfdesktop_version_micro], [0])
 m4_define([xfdesktop_version_nano], [])
-m4_define([xfdesktop_version_build], [r at REVISION@])
-m4_define([xfdesktop_version_tag],[])
-m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_nano(), [], [], [.xfdesktop_version_nano()])ifelse(xfdesktop_version_tag(), [svn], [xfdesktop_version_tag()-xfdesktop_version_build()], [xfdesktop_version_tag()])])
+m4_define([xfdesktop_version_build], [@REVISION@])
+m4_define([xfdesktop_version_tag],[git])
+m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_nano(), [], [], [.xfdesktop_version_nano()])ifelse(xfdesktop_version_tag(), [git], [xfdesktop_version_tag()-xfdesktop_version_build()], [xfdesktop_version_tag()])])
 
 dnl minimum required versions
 m4_define([gtk_minimum_version], [2.10.0])