r23776: Setting version in 3.2 branch to 3.2.1pre1-SVN

[ira/wip.git] / source3 / VERSION

diff --git a/source3/VERSION b/source3/VERSION
index 96acc9a178dbbdcd2f806fe416f36e68d2c68bc6..4635bcd16905ba3bfe858959a4d503a4f9da9808 100644 (file)
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -1,6 +1,12 @@
 ########################################################
 # 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                                    #
@@ -18,8 +24,20 @@
 #  ->  "3.0.0"                                         #
 ########################################################
 SAMBA_VERSION_MAJOR=3
-SAMBA_VERSION_MINOR=0
-SAMBA_VERSION_RELEASE=20
+SAMBA_VERSION_MINOR=2
+SAMBA_VERSION_RELEASE=1
+
+########################################################
+# 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_REVISION=a                        #
+#  ->  "2.2.8a"                                        #
+########################################################
+SAMBA_VERSION_REVISION=
 
 ########################################################
 # For 'pre' releases the version will be               #
@@ -79,3 +97,4 @@ SAMBA_VERSION_IS_SVN_SNAPSHOT=yes
 #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
 ########################################################
 SAMBA_VERSION_VENDOR_SUFFIX=
+SAMBA_VENDOR_PATCH=