diff options
author | Stefan Metzmacher <metze@samba.org> | 2004-04-14 08:47:53 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:14 -0500 |
commit | f8c418a0afba2aae6449e91ec83312cb92a46c34 (patch) | |
tree | f86a0daa2be0c9aa9f240a3dadf02199779a338a /source3/VERSION | |
parent | 8e87cf8ad99d8e67620222959ce54f199b231025 (diff) | |
download | samba-f8c418a0afba2aae6449e91ec83312cb92a46c34.tar.gz samba-f8c418a0afba2aae6449e91ec83312cb92a46c34.tar.bz2 samba-f8c418a0afba2aae6449e91ec83312cb92a46c34.zip |
r208: merge the version schema changes from 4_0
metze
(This used to be commit 4d9d8e83aa367fe17a74b81d4417cc2cfbdf200e)
Diffstat (limited to 'source3/VERSION')
-rw-r--r-- | source3/VERSION | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/source3/VERSION b/source3/VERSION index 991b12dcbb..63953826cf 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -54,46 +54,16 @@ SAMBA_VERSION_PRE_RELEASE=3 SAMBA_VERSION_RC_RELEASE= ######################################################## -# For 'beta' releases the version will be # -# # -# <MAJOR>.<MINOR>.<RELEASE>beta<BETA_RELEASE> # -# # -# e.g. SAMBA_VERSION_BETA_RELEASE=3 # -# -> "3.0.0beta3" # -######################################################## -SAMBA_VERSION_BETA_RELEASE= - -######################################################## -# For 'alpha' releases the version will be # -# # -# <MAJOR>.<MINOR>.<RELEASE>alpha<ALPHA_RELEASE> # -# # -# e.g. SAMBA_VERSION_ALPHA_RELEASE=1 # -# -> "4.0.0alpha1" # -######################################################## -SAMBA_VERSION_ALPHA_RELEASE= - -######################################################## -# For 'test' releases the version will be # -# # -# <MAJOR>.<MINOR>.<RELEASE>test<TEST_RELEASE> # -# # -# e.g. SAMBA_VERSION_TEST_RELEASE=1 # -# -> "4.0.0test1" # -######################################################## -SAMBA_VERSION_TEST_RELEASE= - -######################################################## -# To mark CVS snapshots this should be set to 'yes' # +# 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_CVS_SNAPSHOT=yes # -# -> "CVS 3.0.0rc2" # +# e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes # +# -> "3.0.0-SVN-build-199" # ######################################################## -SAMBA_VERSION_IS_CVS_SNAPSHOT=yes +SAMBA_VERSION_IS_SVN_SNAPSHOT=yes ######################################################## # This can be set by vendors if they want... # |