s3-util: for convenience, provide format comments in tdb_unpack().

[jra/samba/.git] / source3 / VERSION

diff --git a/source3/VERSION b/source3/VERSION
index f0883b95bb0213ede89eec478c07777d37dd448c..180d04e8821c712ee9495ec9873f50681596f592 100644 (file)
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -24,7 +24,7 @@
 #  ->  "3.0.0"                                         #
 ########################################################
 SAMBA_VERSION_MAJOR=3
-SAMBA_VERSION_MINOR=2
+SAMBA_VERSION_MINOR=4
 SAMBA_VERSION_RELEASE=0
 
 ########################################################
@@ -46,7 +46,7 @@ SAMBA_VERSION_REVISION=
 # e.g. SAMBA_VERSION_PRE_RELEASE=1                     #
 #  ->  "2.2.9pre1"                                     #
 ########################################################
-SAMBA_VERSION_PRE_RELEASE=2
+SAMBA_VERSION_PRE_RELEASE=
 
 ########################################################
 # For 'rc' releases the version will be                #
@@ -72,8 +72,6 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
 
 ########################################################
 # This can be set by vendors if they want...           #
-# This can be a string constant or a function which    #
-# returns a string (const char *)                      #
 #                                                      #
 # <MAJOR>.<MINOR>.<RELEASE>[...]-<VENDOR_SUFFIX>       #
 #                                                      #
@@ -82,18 +80,26 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
 # 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.                                        #
+# Note: If you want to use a function, take a look at  #
+#       SAMBA_VERSION_VENDOR_FUNCTION                  #
 #                                                      #
-# const char *vendor_version(void)                     #
+########################################################
+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 "VendorVersion";                        #
+#   return SAMBA_VERSION_OFFICIAL_STRING "-ENREDO-1.0" #
 # }                                                    #
 #                                                      #
-# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
-#  ->  "CVS 3.0.0rc2-VendorVersion"                    #
+# -> "Version 3.2.0-ENREDO-1.0                         #
 ########################################################
-SAMBA_VERSION_VENDOR_SUFFIX="stable"
-SAMBA_VERSION_VENDOR_PATCH=
+SAMBA_VERSION_VENDOR_FUNCTION=