Updating branch refs/heads/master to 98a73ae5b52ce26010bb30f574b5e4eeba601309 (commit) from fc24aa2972d14d815f743c6a93270252239599ed (commit)
commit 98a73ae5b52ce26010bb30f574b5e4eeba601309 Author: Jannis Pohlmann <jan...@xfce.org> Date: Thu Sep 17 02:38:14 2009 +0200 Update to xfce4-dev-tools 4.7.0. autogen.sh | 25 +------------------------ configure.in.in | 6 +++--- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/autogen.sh b/autogen.sh index 6be74d7..6dd7849 100755 --- a/autogen.sh +++ b/autogen.sh @@ -18,29 +18,6 @@ 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` -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` -else - revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'` -fi -sed -e "s/@LINGUAS@/${linguas}/g" \ - -e "s/@REVISION@/${revision}/g" \ - < "configure.in.in" > "configure.in" - -exec xdt-autogen $@ +XDT_AUTOGEN_REQUIRED_VERSION="4.7.0" exec xdt-autogen $@ # vi:set ts=2 sw=2 et ai: diff --git a/configure.in.in b/configure.in.in index 36ea09d..7b3d553 100644 --- a/configure.in.in +++ b/configure.in.in @@ -14,10 +14,10 @@ m4_define([libxfce4util_verinfo], [5:1:1]) m4_define([libxfce4util_version_major], [4]) m4_define([libxfce4util_version_minor], [7]) m4_define([libxfce4util_version_micro], [0]) -m4_define([libxfce4util_version_nano], []) dnl leave this empty to have no nano version +m4_define([libxfce4util_version_nano], [git]) dnl leave this empty to have no nano version m4_define([libxfce4util_version_build], [...@revision@]) m4_define([libxfce4util_version_tag], []) -m4_define([libxfce4util_version], [libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(), [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), [svn], [libxfce4util_version_tag()-libxfce4util_version_build()], [])]) +m4_define([libxfce4util_version], [libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(), [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), [git], [libxfce4util_version_tag()-libxfce4util_version_build()], [])]) dnl ************************************************************** dnl *** Overall Xfce version, modify this when making releases *** @@ -32,7 +32,7 @@ dnl # YOU ARE DOING. dnl ******************************************** dnl *** Full debug support for SVN snapshots *** dnl ******************************************** -m4_define([libxfce4util_debug_default], [ifelse(libxfce4util_version_tag(), [svn], [full], [minimum])]) +m4_define([libxfce4util_debug_default], [ifelse(libxfce4util_version_tag(), [git], [full], [minimum])]) dnl *************************** dnl *** Initialize autoconf *** _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits