Updating branch refs/heads/master to 85d2709efc2c9165b1ba0d38c467d01dc94618da (commit) from 6eb0308f18da3c81c3b62d0c3e74071c1c13fabb (commit)
commit 85d2709efc2c9165b1ba0d38c467d01dc94618da Author: Jannis Pohlmann <jan...@xfce.org> Date: Tue Sep 15 14:54:21 2009 +0200 Remove LINGUAS, update to xfce4-dev-tools 4.7.0. autogen.sh | 18 +----------------- configure.in.in | 6 +++--- po/LINGUAS | 2 -- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/autogen.sh b/autogen.sh index d0c27f8..6dd7849 100755 --- a/autogen.sh +++ b/autogen.sh @@ -18,22 +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` -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 $@ +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 57d0792..3e75d93 100644 --- a/configure.in.in +++ b/configure.in.in @@ -13,8 +13,8 @@ m4_define([libxfce4ui_version_minor], [7]) m4_define([libxfce4ui_version_micro], [0]) m4_define([libxfce4ui_version_nano], []) dnl leave this empty to have no nano version m4_define([libxfce4ui_version_build], [...@revision@]) -m4_define([libxfce4ui_version_tag], [svn]) -m4_define([libxfce4ui_version], [libxfce4ui_version_major().libxfce4ui_version_minor().libxfce4ui_version_micro()ifelse(libxfce4ui_version_nano(), [], [], [.libxfce4ui_version_nano()])ifelse(libxfce4ui_version_tag(), [svn], [libxfce4ui_version_tag()-libxfce4ui_version_build()], [libxfce4ui_version_tag()])]) +m4_define([libxfce4ui_version_tag], [git]) +m4_define([libxfce4ui_version], [libxfce4ui_version_major().libxfce4ui_version_minor().libxfce4ui_version_micro()ifelse(libxfce4ui_version_nano(), [], [], [.libxfce4ui_version_nano()])ifelse(libxfce4ui_version_tag(), [git], [libxfce4ui_version_tag()-libxfce4ui_version_build()], [libxfce4ui_version_tag()])]) m4_define([libxfce4kbd_private_verinfo], [0:0:0]) m4_define([libxfce4kbd_private_version_api], [2]) @@ -29,7 +29,7 @@ dnl # YOU ARE DOING. dnl ******************************************** dnl *** Full debug support for SVN snapshots *** dnl ******************************************** -m4_define([libxfce4ui_debug_default], [ifelse(libxfce4ui_version_tag(), [svn], [full], [minimum])]) +m4_define([libxfce4ui_debug_default], [ifelse(libxfce4ui_version_tag(), [git], [full], [minimum])]) dnl *************************** dnl *** Initialize autoconf *** diff --git a/po/LINGUAS b/po/LINGUAS deleted file mode 100644 index 6e75b5f..0000000 --- a/po/LINGUAS +++ /dev/null @@ -1,2 +0,0 @@ -# set of available languages (in alphabetic order) -ast ca cs da de en_GB es eu fi fr gl hu id it ja kk lv ku pl pt pt_BR ro sv tl_PH tr uk ur ur_PK zh_CN _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits