Revert "Set -test in the vendor version"

[ira/wip.git] / source / VERSION

diff --git a/source/VERSION b/source/VERSION
index fffd2a005e884f7eb49e3bf4d7f97e8bf1f5f43f..29ff51638e3b94809a474dd7e8029f0dece36b65 100644 (file)
--- a/source/VERSION
+++ b/source/VERSION
@@ -23,8 +23,8 @@
 #      SAMBA_VERSION_RELEASE=0                         #
 #  ->  "3.0.0"                                         #
 ########################################################
-SAMBA_VERSION_MAJOR=3
-SAMBA_VERSION_MINOR=9
+SAMBA_VERSION_MAJOR=4
+SAMBA_VERSION_MINOR=0
 SAMBA_VERSION_RELEASE=0
 
 ########################################################
@@ -49,6 +49,16 @@ SAMBA_VERSION_REVISION=
 ########################################################
 SAMBA_VERSION_TP_RELEASE=
 
+########################################################
+# For 'alpha' releases the version will be             #
+#                                                      #
+# <MAJOR>.<MINOR>.<RELEASE>alpha<TP_RELEASE>           #
+#                                                      #
+# e.g. SAMBA_VERSION_ALPHA_RELEASE=1                   #
+#  ->  "4.0.0alpha1"                                   #
+########################################################
+SAMBA_VERSION_ALPHA_RELEASE=3
+
 ########################################################
 # For 'pre' releases the version will be               #
 #                                                      #
@@ -74,17 +84,17 @@ SAMBA_VERSION_RC_RELEASE=
 # in the development BRANCH, and set to 'no' only in   #
 # the SAMBA_X_X_RELEASE BRANCH                         #
 #                                                      #
-# <MAJOR>.<MINOR>.<RELEASE>[...]cvs                    #
+# <MAJOR>.<MINOR>.<RELEASE>[...]-SVN-build-xxx         #
 #                                                      #
 # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes               #
 #  ->  "3.0.0-SVN-build-199"                           #
 ########################################################
-SAMBA_VERSION_IS_SVN_SNAPSHOT=yes
+SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
 
 ########################################################
 # This is for specifying a release nickname            #
 #                                                      #
-# e.g. SAMBA_VERSION_RELEASE_NICKNAME="Nicky Nickname" #
+# e.g. SAMBA_VERSION_RELEASE_NICKNAME=Nicky Nickname   #
 #      smbd --version will then give:                  #
 #  ->  "4.0.0-tp1-VendorVersion (Nicky Nickname)"      #
 ########################################################
@@ -99,21 +109,9 @@ SAMBA_VERSION_RELEASE_NICKNAME=
 #                                                      #
 # 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=