Add a few more safety catches to the mkrelease.sh script.

[jelmer/samba4-debian.git] / source / VERSION

diff --git a/source/VERSION b/source/VERSION
index 91c1f98b38109401f71897a960976efe9ebdb8a0..29ff51638e3b94809a474dd7e8029f0dece36b65 100644 (file)
--- a/source/VERSION
+++ b/source/VERSION
@@ -1,6 +1,12 @@
 ########################################################
 # SAMBA Version                                        #
 #                                                      #
+# Samba versions are as follows                        #
+# 3.0.x                New production series           #
+# 3.0.x{tp,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                                    #
@@ -28,72 +34,71 @@ SAMBA_VERSION_RELEASE=0
 # so SAMBA's version will be                           #
 # <MAJOR>.<MINOR>.<RELEASE><REVISION>                  #
 #                                                      #
-# e.g. SAMBA_VERSION_PRE_RELEASE=a                     #
+# e.g. SAMBA_VERSION_REVISION=a                        #
 #  ->  "2.2.8a"                                        #
 ########################################################
 SAMBA_VERSION_REVISION=
 
 ########################################################
-# For 'pre' releases the version will be               #
+# For 'tp' releases the version will be                #
 #                                                      #
-# <MAJOR>.<MINOR>.<RELEASE>pre<PRE_RELEASE>            #
+# <MAJOR>.<MINOR>.<RELEASE>tp<TP_RELEASE>              #
 #                                                      #
-# e.g. SAMBA_VERSION_PRE_RELEASE=1                     #
-#  ->  "2.2.9pre1"                                     #
+# e.g. SAMBA_VERSION_TP_RELEASE=1                      #
+#  ->  "4.0.0tp1"                                      #
 ########################################################
-SAMBA_VERSION_PRE_RELEASE=
+SAMBA_VERSION_TP_RELEASE=
 
 ########################################################
-# For 'rc' releases the version will be                #
+# For 'alpha' releases the version will be             #
 #                                                      #
-# <MAJOR>.<MINOR>.<RELEASE>rc<RC_RELEASE>              #
+# <MAJOR>.<MINOR>.<RELEASE>alpha<TP_RELEASE>           #
 #                                                      #
-# e.g. SAMBA_VERSION_RC_RELEASE=1                      #
-#  ->  "3.0.0rc1"                                      #
+# e.g. SAMBA_VERSION_ALPHA_RELEASE=1                   #
+#  ->  "4.0.0alpha1"                                   #
 ########################################################
-SAMBA_VERSION_RC_RELEASE=
+SAMBA_VERSION_ALPHA_RELEASE=3
 
 ########################################################
-# For 'beta' releases the version will be              #
+# For 'pre' releases the version will be               #
 #                                                      #
-# <MAJOR>.<MINOR>.<RELEASE>beta<BETA_RELEASE>          #
+# <MAJOR>.<MINOR>.<RELEASE>pre<PRE_RELEASE>            #
 #                                                      #
-# e.g. SAMBA_VERSION_BETA_RELEASE=3                    #
-#  ->  "3.0.0beta3"                                    #
+# e.g. SAMBA_VERSION_PRE_RELEASE=1                     #
+#  ->  "2.2.9pre1"                                     #
 ########################################################
-SAMBA_VERSION_BETA_RELEASE=
+SAMBA_VERSION_PRE_RELEASE=
 
 ########################################################
-# For 'alpha' releases the version will be             #
+# For 'rc' releases the version will be                #
 #                                                      #
-# <MAJOR>.<MINOR>.<RELEASE>alpha<ALPHA_RELEASE>        #
+# <MAJOR>.<MINOR>.<RELEASE>rc<RC_RELEASE>              #
 #                                                      #
-# e.g. SAMBA_VERSION_ALPHA_RELEASE=1                   #
-#  ->  "4.0.0alpha1"                                   #
+# e.g. SAMBA_VERSION_RC_RELEASE=1                      #
+#  ->  "3.0.0rc1"                                      #
 ########################################################
-SAMBA_VERSION_ALPHA_RELEASE=
+SAMBA_VERSION_RC_RELEASE=
 
 ########################################################
-# For 'test' releases the version will be              #
+# 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>test<TEST_RELEASE>          #
+# <MAJOR>.<MINOR>.<RELEASE>[...]-SVN-build-xxx         #
 #                                                      #
-# e.g. SAMBA_VERSION_TEST_RELEASE=1                    #
-#  ->  "4.0.0test1"                                    #
+# e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes               #
+#  ->  "3.0.0-SVN-build-199"                           #
 ########################################################
-SAMBA_VERSION_TEST_RELEASE=1
+SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
 
 ########################################################
-# To mark CVS 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                    #
+# This is for specifying a release nickname            #
 #                                                      #
-# e.g. SAMBA_VERSION_IS_CVS_SNAPSHOT=yes               #
-#  ->  "CVS 3.0.0rc2"                                  #
+# e.g. SAMBA_VERSION_RELEASE_NICKNAME=Nicky Nickname   #
+#      smbd --version will then give:                  #
+#  ->  "4.0.0-tp1-VendorVersion (Nicky Nickname)"      #
 ########################################################
-SAMBA_VERSION_IS_CVS_SNAPSHOT=yes
+SAMBA_VERSION_RELEASE_NICKNAME=
 
 ########################################################
 # This can be set by vendors if they want...           #
@@ -104,20 +109,9 @@ SAMBA_VERSION_IS_CVS_SNAPSHOT=yes
 #                                                      #
 # Note the '-' is automaticaly added                   #
 #                                                      #
-# e.g. SAMBA_VERSION_VENDOR_SUFFIX="VendorVersion"     #
-#  ->  "CVS 3.0.0rc2-VendorVersion"                    #
-#                                                      #
-# Note: If you want to use a function,                 #
-#       then patch lib/version.c and add this function #
-#       there, because the symbol must be available in #
-#       binary.                                        #
-#                                                      #
-# const char *vendor_version(void)                     #
-# {                                                    #
-#      return "VendorVersion";                        #
-# }                                                    #
+# e.g. SAMBA_VERSION_VENDOR_SUFFIX=VendorVersion       #
+#  ->  "3.0.0rc2-VendorVersion"                        #
 #                                                      #
-# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
-#  ->  "CVS 3.0.0rc2-VendorVersion"                    #
 ########################################################
 SAMBA_VERSION_VENDOR_SUFFIX=
+SAMBA_VERSION_VENDOR_PATCH=