[Xfce4-commits] <thunar-vfs:master> Update to xfce4-dev-tools 4.7.0.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 2b8f587c289c5c25fa570c9d57651b55bd719346 (commit)
       from b98181e483c753e385a8566926db04de34f8c9d8 (commit)

commit 2b8f587c289c5c25fa570c9d57651b55bd719346
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Fri Sep 18 04:55:35 2009 +0200

    Update to xfce4-dev-tools 4.7.0.

 autogen.sh      |   22 ++--------------------
 configure.in.in |    8 ++++----
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 9bbd678..daed9b6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id$
+# vi:set et ai sw=2 sts=2 ts=2: */
 #
 # Copyright (c) 2002-2006
 #         The Thunar development team. All rights reserved.
@@ -18,22 +18,4 @@ 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 "%05d\n", $2}'`
-sed -e "s/@LINGUAS@/${linguas}/g" \
-    -e "s/@REVISION@/${revision}/g" \
-    < "configure.in.in" > "configure.in"
-
-exec xdt-autogen $@
-
-# vi:set ts=2 sw=2 et ai:
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.0" exec xdt-autogen $@
diff --git a/configure.in.in b/configure.in.in
index 0da70af..007727f 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -15,14 +15,14 @@ m4_define([thunar_vfs_version_major], [1])
 m4_define([thunar_vfs_version_minor], [0])
 m4_define([thunar_vfs_version_micro], [1])
 m4_define([thunar_vfs_version_nano], [])
-m4_define([thunar_vfs_version_build], [r at REVISION@])
-m4_define([thunar_vfs_version_tag], [])
-m4_define([thunar_vfs_version], [thunar_vfs_version_major().thunar_vfs_version_minor().thunar_vfs_version_micro()ifelse(thunar_vfs_version_nano(), [], [], [.thunar_vfs_version_nano()])ifelse(thunar_vfs_version_tag(), [svn], [thunar_vfs_version_tag()-thunar_vfs_version_build()], [thunar_vfs_version_tag()])])
+m4_define([thunar_vfs_version_build], [@REVISION@])
+m4_define([thunar_vfs_version_tag], [git])
+m4_define([thunar_vfs_version], [thunar_vfs_version_major().thunar_vfs_version_minor().thunar_vfs_version_micro()ifelse(thunar_vfs_version_nano(), [], [], [.thunar_vfs_version_nano()])ifelse(thunar_vfs_version_tag(), [git], [thunar_vfs_version_tag()-thunar_vfs_version_build()], [thunar_vfs_version_tag()])])
 
 dnl *******************************************
 dnl *** Debugging support for SVN snapshots ***
 dnl *******************************************
-m4_define([thunar_vfs_debug_default], [ifelse(thunar_vfs_version_tag(), [svn], [yes], [minimum])])
+m4_define([thunar_vfs_debug_default], [ifelse(thunar_vfs_version_tag(), [git], [yes], [minimum])])
 
 dnl ***************************
 dnl *** Initialize autoconf ***