summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/VERSION105
-rwxr-xr-xsource3/script/mkversion.sh2
2 files changed, 1 insertions, 106 deletions
diff --git a/source3/VERSION b/source3/VERSION
deleted file mode 100644
index fcab12af6e..0000000000
--- a/source3/VERSION
+++ /dev/null
@@ -1,105 +0,0 @@
-########################################################
-# SAMBA Version #
-# #
-# Samba versions are as follows #
-# 3.0.x New production series #
-# 3.0.x{pre,rc}y Preview/Testing & RC #
-# 3.0.x[a-z] Patch releases #
-# 3.0.x[a-z]-VENDOR-z Vendor patch releases #
-# #
-# script/mkversion.sh #
-# will use this file to create #
-# include/version.h #
-# #
-########################################################
-
-########################################################
-# This are the main SAMBA version numbers #
-# #
-# <MAJOR>.<MINOR>.<RELEASE> #
-# #
-# e.g. SAMBA_VERSION_MAJOR=3 #
-# SAMBA_VERSION_MINOR=0 #
-# SAMBA_VERSION_RELEASE=0 #
-# -> "3.0.0" #
-########################################################
-SAMBA_VERSION_MAJOR=3
-SAMBA_VERSION_MINOR=6
-SAMBA_VERSION_RELEASE=0
-
-########################################################
-# Bug fix releases use a letter for the patch revision #
-# #
-# so SAMBA's version will be #
-# <MAJOR>.<MINOR>.<RELEASE><REVISION> #
-# #
-# e.g. SAMBA_VERSION_REVISION=a #
-# -> "2.2.8a" #
-########################################################
-SAMBA_VERSION_REVISION=
-
-########################################################
-# For 'pre' releases the version will be #
-# #
-# <MAJOR>.<MINOR>.<RELEASE>pre<PRE_RELEASE> #
-# #
-# e.g. SAMBA_VERSION_PRE_RELEASE=1 #
-# -> "2.2.9pre1" #
-########################################################
-SAMBA_VERSION_PRE_RELEASE=
-
-########################################################
-# For 'rc' releases the version will be #
-# #
-# <MAJOR>.<MINOR>.<RELEASE>rc<RC_RELEASE> #
-# #
-# e.g. SAMBA_VERSION_RC_RELEASE=1 #
-# -> "3.0.0rc1" #
-########################################################
-SAMBA_VERSION_RC_RELEASE=
-
-########################################################
-# To mark SVN snapshots this should be set to 'yes' #
-# in the development BRANCH, and set to 'no' only in #
-# the SAMBA_X_X_RELEASE BRANCH #
-# #
-# <MAJOR>.<MINOR>.<RELEASE>[...]cvs #
-# #
-# e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes #
-# -> "3.0.0-SVN-build-199" #
-########################################################
-SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
-
-########################################################
-# This can be set by vendors if they want... #
-# #
-# <MAJOR>.<MINOR>.<RELEASE>[...]-<VENDOR_SUFFIX> #
-# #
-# Note the '-' is automatically added #
-# #
-# e.g. SAMBA_VERSION_VENDOR_SUFFIX="VendorVersion" #
-# -> "CVS 3.0.0rc2-VendorVersion" #
-# #
-# Note: If you want to use a function, take a look at #
-# SAMBA_VERSION_VENDOR_FUNCTION #
-# #
-########################################################
-SAMBA_VERSION_VENDOR_SUFFIX="devel"
-SAMBA_VERSION_VENDOR_PATCH=
-
-########################################################
-# This can be set by vendors if they want.. #
-# This have to be a function which returns a string #
-# (const char *). #
-# #
-# Patch for example lib/version.c and add something #
-# like the following example: #
-# #
-# const char *samba_vendor_version(void) #
-# { #
-# return SAMBA_VERSION_OFFICIAL_STRING "-ENREDO-1.0" #
-# } #
-# #
-# -> "Version 3.2.0-ENREDO-1.0 #
-########################################################
-SAMBA_VERSION_VENDOR_FUNCTION=
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index 5ad197dd56..0e4a860363 100755
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -4,7 +4,7 @@ VERSION_FILE=$1
OUTPUT_FILE=$2
if test -z "$VERSION_FILE";then
- VERSION_FILE="VERSION"
+ VERSION_FILE="../VERSION"
fi
if test -z "$OUTPUT_FILE";then