r824: merge from: SAMBA_4_0:

use 'Last Change Rev:' instead of 'Revision:' from the svn info output
for setting the SVN_REVISION in version.h

metze

diff --git a/source/script/mkversion.sh b/source/script/mkversion.sh
index 917a9ed1ae373a1df254c23295b9ac7c494b4e24..492ecaade2a25520503e2976669a1f70de64e923 100755 (executable)
--- a/source/script/mkversion.sh
+++ b/source/script/mkversion.sh
@@ -48,7 +48,7 @@ fi
 if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
     HAVESVN=no
     svn info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVN=yes
-    TMP_REVISION=`(svn info ${SOURCE_DIR} 2>/dev/null || svk info ${SOURCE_DIR} 2>/dev/null) |grep Revision: |sed -e 's/Revision: \([0-9]*\).*/\1/'`
+    TMP_REVISION=`(svn info ${SOURCE_DIR} 2>/dev/null || svk info ${SOURCE_DIR} 2>/dev/null) |grep 'Last Changed Rev.*:' |sed -e 's/Last Changed Rev.*: \([0-9]*\).*/\1/'`
     if test x"${HAVESVN}" = x"no";then
        HAVESVK=no
        svk info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVK=yes