[Goodies-commits] r3820 - xfmpc/trunk

[Mike Massonnet]

Author: mmassonnet
Date: 2008-01-19 10:36:40 +0000 (Sat, 19 Jan 2008)
New Revision: 3820

Modified:
   xfmpc/trunk/ChangeLog
   xfmpc/trunk/autogen.sh
   xfmpc/trunk/configure.in.in
Log:
* === Release 0.0.1 ===
* autogen.sh: Use .git/svn revision number if there
* configure.in.in: Remove svn version tag


Modified: xfmpc/trunk/ChangeLog
===================================================================
--- xfmpc/trunk/ChangeLog	2008-01-19 10:09:38 UTC (rev 3819)
+++ xfmpc/trunk/ChangeLog	2008-01-19 10:36:40 UTC (rev 3820)
@@ -1,5 +1,11 @@
 2008-01-19	Mike Massonnet <mmassonnet at xfce.org>
 
+	* === Release 0.0.1 ===
+	* autogen.sh: Use .git/svn revision number if there
+	* configure.in.in: Remove svn version tag
+
+2008-01-19	Mike Massonnet <mmassonnet at xfce.org>
+
 	* AUTHORS, ChangeLog, README, po/ChangeLog:
 	  - Update text files
 

Modified: xfmpc/trunk/autogen.sh
===================================================================
--- xfmpc/trunk/autogen.sh	2008-01-19 10:09:38 UTC (rev 3819)
+++ xfmpc/trunk/autogen.sh	2008-01-19 10:36:40 UTC (rev 3820)
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Copyright (c) 2002-2006
+# Copyright (c) 2002-2008
 #         The Thunar development team. All rights reserved.
 #
 # Written for Thunar by Benedikt Meurer <benny at xfce.org>.
@@ -29,9 +29,16 @@
 
 # substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%04d\n", $2}'`
+if test -d .git/svn; then
+  revision=`LC_ALL=C git-svn find-rev HEAD`
+elif test -f .svn; then
+  revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+else
+  revision=""
+fi
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
     < "configure.in.in" > "configure.in"
 
 exec xdt-autogen $@
+

Modified: xfmpc/trunk/configure.in.in
===================================================================
--- xfmpc/trunk/configure.in.in	2008-01-19 10:09:38 UTC (rev 3819)
+++ xfmpc/trunk/configure.in.in	2008-01-19 10:36:40 UTC (rev 3820)
@@ -12,7 +12,7 @@
 m4_define([xfmpc_version_minor], [0])
 m4_define([xfmpc_version_micro], [1])
 m4_define([xfmpc_version_build], [r at REVISION@])
-m4_define([xfmpc_version_tag], [svn]) # leave empty for release
+m4_define([xfmpc_version_tag], []) # leave empty for release
 m4_define([xfmpc_version], [xfmpc_version_major().xfmpc_version_minor().xfmpc_version_micro()ifelse(xfmpc_version_tag(), [svn], [xfmpc_version_tag()-xfmpc_version_build()], [xfmpc_version_tag()])])
 
 dnl ***************************