[Xfce4-commits] <garcon:master> Drop some old svn stuff.

[Nick Schermer]

Updating branch refs/heads/master
         to cd82e73cf251601b3ba511634754020ed764f89d (commit)
       from ef110722a651a7ede4d2739eeb6716459b7b85f2 (commit)

commit cd82e73cf251601b3ba511634754020ed764f89d
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Aug 16 20:58:28 2009 +0200

    Drop some old svn stuff.

 HACKING         |   13 +++++--------
 autogen.sh      |    9 +++------
 configure.in.in |    6 +++---
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/HACKING b/HACKING
index 63ad4d3..870fb72 100644
--- a/HACKING
+++ b/HACKING
@@ -13,10 +13,10 @@ people listed in the AUTHORS file. Your patch should be in unified
 diff format (the -u option to GNU diff).
 
 Please and send a patch against a recent version of this package. Patches
-against the Subversion trunk branch are most preferable. You can always
-access the trunk branch from 
+against the Git master branch are most preferable. You can always
+access the master branch from 
 
-  http://svn.xfce.org/svn/xfce/garcon/trunk
+  http://git.xfce.org/libs/garcon/
 
 
 Feature requests
@@ -50,10 +50,7 @@ Release process
   6) Unset garcon_version_tag in configure.in.in and reset it after the
      release is done.
   7) Verify that make dist works.
-  8) "svn commit" the changes.
-  9) Create a simple tag for the release,
-      "svn copy https://xfce.org/svn/xfce/garcon/trunk
-       https://xfce.org/svn/xfce/garcon/tags/garcon-X.Y.Ztag"
-     where X.Y.Z is the version number and tag is the version tag, i.e. beta1.
+  8) "git commit -a" the changes.
+  9) Create a simple tag for the release.
  10) Upload the tarballs to xfce.org
  11) Upload the new online documentation to www.xfce.org.
diff --git a/autogen.sh b/autogen.sh
index 8aac64d..5053f25 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -40,13 +40,10 @@ EOF
 
 # Substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
-if test -d .git/svn; then
-  revision=$(git svn find-rev trunk 2>/dev/null ||
-             git svn find-rev origin/trunk 2>/dev/null ||
-             git svn find-rev HEAD 2>/dev/null ||
-             git svn find-rev master 2>/dev/null)
+if test -d .git; then
+  revision=$(git rev-parse --short HEAD 2>/dev/null)
 else
-  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",$2}'`
+  revision="Unknown"
 fi
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
diff --git a/configure.in.in b/configure.in.in
index 92f6e61..6caf0fe 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -25,8 +25,8 @@ m4_define([garcon_version_api_major], [1])
 m4_define([garcon_version_major], [0])
 m4_define([garcon_version_minor], [1])
 m4_define([garcon_version_micro], [0])
-m4_define([garcon_version_build], [r at REVISION@])
-m4_define([garcon_version_tag], [svn])
+m4_define([garcon_version_build], [@REVISION@])
+m4_define([garcon_version_tag], [git])
 m4_define([garcon_version], [garcon_version_major().garcon_version_minor().garcon_version_micro()ifelse(garcon_version_tag(), [svn], [garcon_version_tag()-garcon_version_build()], [garcon_version_tag()])])
 
 dnl ********************************************
@@ -40,7 +40,7 @@ dnl ***************************
 AC_COPYRIGHT([Copyright (c) 2007-2009 Jannis Pohlmann <jannis at xfce.org>])
 AC_INIT([garcon], [garcon_version], [http://bugzilla.xfce.org/])
 AC_PREREQ([2.50])
-AC_REVISION([$Id$])
+AC_REVISION([@REVISION@])
 AC_CANONICAL_TARGET()
 
 dnl ***************************