[Xfce4-commits] prepare for moving to git.xfce.org

[Mark Trompell]

Updating branch refs/heads/master
         to e358b2a745df240e3ac56f9a1e964469ab00a680 (commit)
       from 3c848a5004fe729c71707ac03a75fb97c147ebef (commit)

commit e358b2a745df240e3ac56f9a1e964469ab00a680
Author: Mark Trompell <m...@foresightlinux.org>
Date:   Wed Aug 19 13:56:22 2009 +0200

    prepare for moving to git.xfce.org

 autogen.sh      |   20 +++++++++-----------
 configure.in.in |    4 ++--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 15b0cd1..bceccc9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,18 +16,16 @@ EOF
   exit 1
 }
 
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
-  cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
-            or try to checkout again.
-EOF
-  exit 1
-}
-
 # substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%04d\n", $2}'`
+linguas=`ls po/*.po | awk 'BEGIN { FS="[./]"; ORS=" " } { print $2 }'`
+if [ -d .git ]; then
+  revision=`git rev-parse --short HEAD 2>/dev/null`
+fi
+
+if [ -z "$revision" ]; then
+  revision="UNKNOWN"
+fi
+
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
     < "configure.in.in" > "configure.in"
diff --git a/configure.in.in b/configure.in.in
index 722bdc7..0d48661 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -10,8 +10,8 @@ m4_define([indicator_version_major], [0])
 m4_define([indicator_version_minor], [0])
 m4_define([indicator_version_micro], [1])
 m4_define([indicator_version_build], [r@REVISION@])
-m4_define([indicator_version_tag], [])
-m4_define([indicator_version], 
[indicator_version_major().indicator_version_minor().indicator_version_micro()ifelse(indicator_version_tag(),
 [svn], [indicator_version_tag()-indicator_version_build()], 
[indicator_version_tag()])])
+m4_define([indicator_version_tag], [git])
+m4_define([indicator_version], 
[indicator_version_major().indicator_version_minor().indicator_version_micro()ifelse(indicator_version_tag(),
 [git], [indicator_version_tag()-indicator_version_build()], 
[indicator_version_tag()])])
 
 dnl ***************************
 dnl *** Initialize autoconf ***
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits