[Xfce4-commits] <xfce4-mpc-plugin:master> Update to use new xfce4-dev-tools semantics.

[Landry Breuil]

Updating branch refs/heads/master
         to 505fbc09bbcbc8f3685a71eb7c89c26cb5b5b908 (commit)
       from 29a5b32bdb7814b013eaf42c8da81930b5d82aae (commit)

commit 505fbc09bbcbc8f3685a71eb7c89c26cb5b5b908
Author: Landry Breuil <landry at xfce.org>
Date:   Thu Aug 20 22:23:22 2009 +0200

    Update to use new xfce4-dev-tools semantics.

 autogen.sh      |   38 ++++++++++----------------------------
 configure.ac.in |    4 ++--
 po/LINGUAS      |    2 --
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 9103976..d3b7588 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,43 +1,25 @@
 #!/bin/sh
 #
-# $Id: autogen.sh 4312 2005-01-27 10:10:04Z jasper $
-#
-# Copyright (c) 2002-2005
+# Copyright (c) 2002-2009
 #         The Xfce development team. All rights reserved.
 #
-# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
+# Written for Xfce by Benedikt Meurer <benny at xfce.org>
+#                 and Brian Tarricone <brian at tarricone.org>.
 #
 
+export XDT_AUTOGEN_REQUIRED_VERSION="4.7.0"
+
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <<EOF
-autogen.sh: You don't seem to have the Xfce development tools installed on
-            your system, which are required to build this software.
-            Please install the xfce4-dev-tools package first, it is available
+autogen.sh: You don't seem to have the Xfce development tools (at least
+            version $XDT_REQURED_VERSION) installed on your system, which
+            are required to build this software.
+            Please install the xfce4-dev-tools package first; it is available
             from http://www.xfce.org/.
 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=`LC_ALL=C git-svn find-rev HEAD`
-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.ac.in" > "configure.ac"
-
-exec xdt-autogen $@
+exec xdt-autogen "$@"
 
 # vi:set ts=2 sw=2 et ai:
diff --git a/configure.ac.in b/configure.ac.in
index 4e9ec0e..0d9a292 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -6,8 +6,8 @@ dnl
 m4_define([mpc_version_major], [0])
 m4_define([mpc_version_minor], [3])
 m4_define([mpc_version_micro], [3])
-m4_define([mpc_version_tag], [svn]) # Leave empty for releases
-m4_define([mpc_version_build], [r at REVISION@])
+m4_define([mpc_version_tag], [git]) # Leave empty for releases
+m4_define([mpc_version_build], [@REVISION@])
 m4_define([mpc_version], [mpc_version_major().mpc_version_minor().mpc_version_micro()ifelse(mpc_version_tag(), [], [], [mpc_version_tag()-mpc_version_build()])])
 
 AC_INIT([xfce4-mpc-plugin], [mpc_version],
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index e572422..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ar ast ca cs da de en_GB es eu fr gl hu id it ja lv pl pt_BR pt sq sv tr uk ur ur_PK zh_CN