1Author: Lars Mueller <lmuelle at SuSE dot de> 2Subject: Non integer SAMBA_VERSION_RELEASE breaks samba-vscan build 3Bugzilla: bugzilla.Samba.org #2618 4 5--- samba-3.0.20b/source/script/mkversion.sh 6+++ samba-3.0.20b/source/script/mkversion.sh 2005-10-22 12:56:30 7@@ -17,6 +17,7 @@ 8 SAMBA_VERSION_MAJOR=`sed -n 's/^SAMBA_VERSION_MAJOR=//p' $SOURCE_DIR$VERSION_FILE` 9 SAMBA_VERSION_MINOR=`sed -n 's/^SAMBA_VERSION_MINOR=//p' $SOURCE_DIR$VERSION_FILE` 10 SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION_FILE` 11+SAMBA_VERSION_RELEASE_SUFFIX=`sed -n 's/^SAMBA_VERSION_RELEASE_SUFFIX=//p' $SOURCE_DIR$VERSION_FILE` 12 13 SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' $SOURCE_DIR$VERSION_FILE` 14 15@@ -31,9 +32,10 @@ 16 echo "#define SAMBA_VERSION_MAJOR ${SAMBA_VERSION_MAJOR}" >> $OUTPUT_FILE 17 echo "#define SAMBA_VERSION_MINOR ${SAMBA_VERSION_MINOR}" >> $OUTPUT_FILE 18 echo "#define SAMBA_VERSION_RELEASE ${SAMBA_VERSION_RELEASE}" >> $OUTPUT_FILE 19+echo "#define SAMBA_VERSION_RELEASE_SUFFIX ${SAMBA_VERSION_RELEASE_SUFFIX}" >> $OUTPUT_FILE 20 21 22-SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}" 23+SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}${SAMBA_VERSION_RELEASE_SUFFIX}" 24 25 26 if test -n "${SAMBA_VERSION_PRE_RELEASE}";then 27--- samba-3.0.20b/source/VERSION 28+++ samba-3.0.20b/source/VERSION 2005-10-22 12:56:30 29@@ -19,7 +19,8 @@ 30 ######################################################## 31 SAMBA_VERSION_MAJOR=3 32 SAMBA_VERSION_MINOR=0 33 SAMBA_VERSION_RELEASE=20 34+SAMBA_VERSION_RELEASE_SUFFIX=b 35 36 ######################################################## 37 # For 'pre' releases the version will be # 38