From 65d9febf9a60be05f64598909679998b5734ac16 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 29 Apr 2004 21:03:42 +0000
Subject: r413: merge from 4_0: as we decide to not do 3.0.2a releases anymore,
 remove the generation stuff from VERSION and mkversion.sh

metze
(This used to be commit 25cbca89baa89327384e80ad5f71577c3db6d6a2)
---
 source3/VERSION             | 12 ------------
 source3/script/mkversion.sh |  7 +------
 2 files changed, 1 insertion(+), 18 deletions(-)

(limited to 'source3')

diff --git a/source3/VERSION b/source3/VERSION
index aa7373b098..70ab709401 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -21,18 +21,6 @@ SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=0
 SAMBA_VERSION_RELEASE=4
 
-########################################################
-# If a official release has a serious bug              #
-# a security release will have 'a' sufffix             #
-#                                                      #
-# so SAMBA's version will be                           #
-# <MAJOR>.<MINOR>.<RELEASE><REVISION>                  #
-#                                                      #
-# e.g. SAMBA_VERSION_PRE_RELEASE=a                     #
-#  ->  "2.2.8a"                                        #
-########################################################
-SAMBA_VERSION_REVISION=
-
 ########################################################
 # For 'pre' releases the version will be               #
 #                                                      #
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index f66e1cc1ac..917a9ed1ae 100755
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -18,8 +18,6 @@ SAMBA_VERSION_MAJOR=`sed -n 's/^SAMBA_VERSION_MAJOR=//p' $SOURCE_DIR$VERSION_FIL
 SAMBA_VERSION_MINOR=`sed -n 's/^SAMBA_VERSION_MINOR=//p' $SOURCE_DIR$VERSION_FILE`
 SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
 
-SAMBA_VERSION_REVISION=`sed -n 's/^SAMBA_VERSION_REVISION=//p' $SOURCE_DIR$VERSION_FILE`
-
 SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
 
 SAMBA_VERSION_RC_RELEASE=`sed -n 's/^SAMBA_VERSION_RC_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
@@ -38,10 +36,7 @@ echo "#define SAMBA_VERSION_RELEASE ${SAMBA_VERSION_RELEASE}" >> $OUTPUT_FILE
 SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}"
 
 
-if test -n "${SAMBA_VERSION_REVISION}";then
-    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}${SAMBA_VERSION_REVISION}"
-    echo "#define SAMBA_VERSION_REVISION \"${SAMBA_VERSION_REVISION}\"" >> $OUTPUT_FILE
-elif test -n "${SAMBA_VERSION_PRE_RELEASE}";then
+if test -n "${SAMBA_VERSION_PRE_RELEASE}";then
     SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}pre${SAMBA_VERSION_PRE_RELEASE}"
     echo "#define SAMBA_VERSION_PRE_RELEASE ${SAMBA_VERSION_PRE_RELEASE}" >> $OUTPUT_FILE
 elif test -n "${SAMBA_VERSION_RC_RELEASE}";then
-- 
cgit