From 8bfe26b62db2e671b143d93a5428f8fb64a9df05 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 20 Aug 2003 17:13:38 +0000 Subject: metze's autogenerate patch for version.h (This used to be commit ae452e51b02672a56adf18aa7a7e365eeaba9272) --- source3/VERSION | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 source3/VERSION (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION new file mode 100644 index 0000000000..dbded9df70 --- /dev/null +++ b/source3/VERSION @@ -0,0 +1,123 @@ +######################################################## +# SAMBA Version # +# # +# script/mkversion.sh # +# will use this file to create # +# include/version.h # +# # +######################################################## + +######################################################## +# This are the main SAMBA version numbers # +# # +# .. # +# # +# e.g. SAMBA_VERSION_MAJOR=3 # +# SAMBA_VERSION_MINOR=0 # +# SAMBA_VERSION_RELEASE=0 # +# -> "3.0.0" # +######################################################## +SAMBA_VERSION_MAJOR=3 +SAMBA_VERSION_MINOR=0 +SAMBA_VERSION_RELEASE=0 + +######################################################## +# If a official release has a serious bug # +# a security release will have 'a' sufffix # +# # +# so SAMBA's version will be # +# .. # +# # +# e.g. SAMBA_VERSION_PRE_RELEASE=a # +# -> "2.2.8a" # +######################################################## +SAMBA_VERSION_REVISION= + +######################################################## +# For 'pre' releases the version will be # +# # +# ..pre # +# # +# e.g. SAMBA_VERSION_PRE_RELEASE=1 # +# -> "2.2.9pre1" # +######################################################## +SAMBA_VERSION_PRE_RELEASE= + +######################################################## +# For 'rc' releases the version will be # +# # +# ..rc # +# # +# e.g. SAMBA_VERSION_RC_RELEASE=1 # +# -> "3.0.0rc1" # +######################################################## +SAMBA_VERSION_RC_RELEASE=2 + +######################################################## +# For 'beta' releases the version will be # +# # +# ..beta # +# # +# e.g. SAMBA_VERSION_BETA_RELEASE=3 # +# -> "3.0.0beta3" # +######################################################## +SAMBA_VERSION_BETA_RELEASE= + +######################################################## +# For 'alpha' releases the version will be # +# # +# ..alpha # +# # +# e.g. SAMBA_VERSION_ALPHA_RELEASE=1 # +# -> "4.0.0alpha1" # +######################################################## +SAMBA_VERSION_ALPHA_RELEASE= + +######################################################## +# For 'test' releases the version will be # +# # +# ..test # +# # +# e.g. SAMBA_VERSION_TEST_RELEASE=1 # +# -> "4.0.0test1" # +######################################################## +SAMBA_VERSION_TEST_RELEASE= + +######################################################## +# 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 # +# # +# ..[...]cvs # +# # +# e.g. SAMBA_VERSION_IS_CVS_SNAPSHOT=yes # +# -> "CVS 3.0.0rc2" # +######################################################## +SAMBA_VERSION_IS_CVS_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 *) # +# # +# ..[...]- # +# # +# 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=vendor_version() # +# -> "CVS 3.0.0rc2-VendorVersion" # +######################################################## +SAMBA_VERSION_VENDOR_SUFFIX= -- cgit From f13957824dbe3661d446bab688649673fa1b0e25 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 29 Aug 2003 04:15:59 +0000 Subject: bumping version (This used to be commit e5f091e79511c5dc15f750e81063a962471634f2) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index dbded9df70..717f003094 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -51,7 +51,7 @@ SAMBA_VERSION_PRE_RELEASE= # e.g. SAMBA_VERSION_RC_RELEASE=1 # # -> "3.0.0rc1" # ######################################################## -SAMBA_VERSION_RC_RELEASE=2 +SAMBA_VERSION_RC_RELEASE=3 ######################################################## # For 'beta' releases the version will be # -- cgit From 6a87470cdd00e89987b51923edb6ac53b47d2678 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 9 Sep 2003 02:02:33 +0000 Subject: bumping new version to CVS 3.01pre1; optmistic about RC3 (This used to be commit fb69ca974db9aca4aa88952f7872369ce6274e8b) --- source3/VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 717f003094..9cf8b11ef1 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=0 +SAMBA_VERSION_RELEASE=1 ######################################################## # If a official release has a serious bug # @@ -41,7 +41,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE= +SAMBA_VERSION_PRE_RELEASE=1 ######################################################## # For 'rc' releases the version will be # @@ -51,7 +51,7 @@ SAMBA_VERSION_PRE_RELEASE= # e.g. SAMBA_VERSION_RC_RELEASE=1 # # -> "3.0.0rc1" # ######################################################## -SAMBA_VERSION_RC_RELEASE=3 +SAMBA_VERSION_RC_RELEASE= ######################################################## # For 'beta' releases the version will be # -- cgit From d466173b91eda460abbf9a9371d82dd1f53f0475 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 10 Oct 2003 19:39:04 +0000 Subject: bumping version (This used to be commit eb28ca80cae18effaa10fe0de4bdff7e709ac91c) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 9cf8b11ef1..d3076d918b 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -41,7 +41,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE=2 ######################################################## # For 'rc' releases the version will be # -- cgit From 885140bcb71863da2a75cce00aba40d22d844dbd Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 19 Nov 2003 18:33:19 +0000 Subject: changing versionb to pre4 (This used to be commit 8c46576f64cc54abd3bc43312559b960af220b60) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index d3076d918b..f15a6409ee 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -41,7 +41,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=2 +SAMBA_VERSION_PRE_RELEASE=4 ######################################################## # For 'rc' releases the version will be # -- cgit From b47a3a920a9a03ecc3e71d6594384cae674b6775 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 4 Dec 2003 21:38:47 +0000 Subject: bumping version in preparation for 3.0.1rc1 (This used to be commit 91c95391c3efd4c1009032acc6af9f7886447c55) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index f15a6409ee..93a3a1aea0 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -41,7 +41,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=4 +SAMBA_VERSION_PRE_RELEASE= ######################################################## # For 'rc' releases the version will be # @@ -51,7 +51,7 @@ SAMBA_VERSION_PRE_RELEASE=4 # e.g. SAMBA_VERSION_RC_RELEASE=1 # # -> "3.0.0rc1" # ######################################################## -SAMBA_VERSION_RC_RELEASE= +SAMBA_VERSION_RC_RELEASE=2 ######################################################## # For 'beta' releases the version will be # -- cgit From d73f554a3594d18d9f85a3a694eb9689d056f2a6 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 10 Dec 2003 14:44:48 +0000 Subject: setting version to 3.0.2pre1 (This used to be commit f0ac8ea48533357733c85f0ce4db3f8bc9ef362b) --- source3/VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 93a3a1aea0..9403aea501 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=1 +SAMBA_VERSION_RELEASE=2 ######################################################## # If a official release has a serious bug # @@ -41,7 +41,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE= +SAMBA_VERSION_PRE_RELEASE=1 ######################################################## # For 'rc' releases the version will be # @@ -51,7 +51,7 @@ SAMBA_VERSION_PRE_RELEASE= # e.g. SAMBA_VERSION_RC_RELEASE=1 # # -> "3.0.0rc1" # ######################################################## -SAMBA_VERSION_RC_RELEASE=2 +SAMBA_VERSION_RC_RELEASE= ######################################################## # For 'beta' releases the version will be # -- cgit From b6acba72cd8b3b35273723b38d801479e1a6fbf7 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 6 Jan 2004 19:14:22 +0000 Subject: bumping to 3.0.2pre2 (This used to be commit 52480d6d05c1008a25b4a45cbf7682fe227df83a) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 9403aea501..ebd90b5998 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -41,7 +41,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE=2 ######################################################## # For 'rc' releases the version will be # -- cgit From 1c3ade4108837cf43d00b5f4f1513b09a450e7d0 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 15 Jan 2004 20:32:27 +0000 Subject: setting version to 3.0.2rc2 (This used to be commit db1c6721bfe72323978b2d2b7fbd7ef29b914573) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index ebd90b5998..4942012d06 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -41,7 +41,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 # @@ -51,7 +51,7 @@ SAMBA_VERSION_PRE_RELEASE=2 # e.g. SAMBA_VERSION_RC_RELEASE=1 # # -> "3.0.0rc1" # ######################################################## -SAMBA_VERSION_RC_RELEASE= +SAMBA_VERSION_RC_RELEASE=2 ######################################################## # For 'beta' releases the version will be # -- cgit From 727afa9e1f116c95386413aae9e62d8d401dccfa Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 27 Jan 2004 15:29:30 +0000 Subject: prepping the SAMBA_3_0 branch for 3.0.3 work (This used to be commit 50f278ddcc046e7578b4397d10c22b424d2b01a3) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 4942012d06..9403aea501 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -41,7 +41,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE= +SAMBA_VERSION_PRE_RELEASE=1 ######################################################## # For 'rc' releases the version will be # @@ -51,7 +51,7 @@ SAMBA_VERSION_PRE_RELEASE= # e.g. SAMBA_VERSION_RC_RELEASE=1 # # -> "3.0.0rc1" # ######################################################## -SAMBA_VERSION_RC_RELEASE=2 +SAMBA_VERSION_RC_RELEASE= ######################################################## # For 'beta' releases the version will be # -- cgit From 41ab2cebcc6aa3e09c9d68af1434b9bc88692303 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 27 Jan 2004 19:00:06 +0000 Subject: forgotten commit -- version == 3.0.3pre1 (This used to be commit 043a81b94de390136bd18f299d71f1edb526be77) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 9403aea501..96c5e6be8b 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=2 +SAMBA_VERSION_RELEASE=3 ######################################################## # If a official release has a serious bug # -- cgit From 45355a1e84d5b3002c6f87498df303d08f53e3b6 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 19 Mar 2004 16:23:54 +0000 Subject: bumping version to 3.0.3pre2 (This used to be commit 54de60405457bd1fdcbaf6d888969cf6ba897ec4) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 96c5e6be8b..00ec36133b 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -41,7 +41,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE=2 ######################################################## # For 'rc' releases the version will be # -- cgit From 13d636c0ff090241f857aad6dfa38942d7f2a626 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 6 Apr 2004 09:27:43 +0000 Subject: r73: bumping version to 3.0.3pre3 (This used to be commit 70fd78025b04062104fec36691efcd1b01252d03) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 00ec36133b..991b12dcbb 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -41,7 +41,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=2 +SAMBA_VERSION_PRE_RELEASE=3 ######################################################## # For 'rc' releases the version will be # -- cgit From f8c418a0afba2aae6449e91ec83312cb92a46c34 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 14 Apr 2004 08:47:53 +0000 Subject: r208: merge the version schema changes from 4_0 metze (This used to be commit 4d9d8e83aa367fe17a74b81d4417cc2cfbdf200e) --- source3/VERSION | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) (limited to 'source3/VERSION') 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 # -# # -# ..beta # -# # -# e.g. SAMBA_VERSION_BETA_RELEASE=3 # -# -> "3.0.0beta3" # -######################################################## -SAMBA_VERSION_BETA_RELEASE= - -######################################################## -# For 'alpha' releases the version will be # -# # -# ..alpha # -# # -# e.g. SAMBA_VERSION_ALPHA_RELEASE=1 # -# -> "4.0.0alpha1" # -######################################################## -SAMBA_VERSION_ALPHA_RELEASE= - -######################################################## -# For 'test' releases the version will be # -# # -# ..test # -# # -# 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 # # # # ..[...]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... # -- cgit From fcc2e1e0f143738de3e56a40a6176f469eb83745 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 29 Apr 2004 11:18:35 +0000 Subject: r403: update version to 3.0.4pre1 metze (This used to be commit efba85d76e20096e1d7acfe855a18a21b8553468) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 63953826cf..aa7373b098 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=3 +SAMBA_VERSION_RELEASE=4 ######################################################## # If a official release has a serious bug # @@ -41,7 +41,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=3 +SAMBA_VERSION_PRE_RELEASE=1 ######################################################## # For 'rc' releases the version will be # -- cgit From 65d9febf9a60be05f64598909679998b5734ac16 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 29 Apr 2004 21:03:42 +0000 Subject: r413: merge from 4_0: as we decide to not do 3.0.2a releases anymore, remove the generation stuff from VERSION and mkversion.sh metze (This used to be commit 25cbca89baa89327384e80ad5f71577c3db6d6a2) --- source3/VERSION | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index aa7373b098..70ab709401 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -21,18 +21,6 @@ SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 SAMBA_VERSION_RELEASE=4 -######################################################## -# If a official release has a serious bug # -# a security release will have 'a' sufffix # -# # -# so SAMBA's version will be # -# .. # -# # -# e.g. SAMBA_VERSION_PRE_RELEASE=a # -# -> "2.2.8a" # -######################################################## -SAMBA_VERSION_REVISION= - ######################################################## # For 'pre' releases the version will be # # # -- cgit From 5cb65233cd5c4f3c740ff3d06807296c2032377d Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 7 May 2004 18:32:47 +0000 Subject: r568: setting version to 3.0.5pre1 (This used to be commit f3efc098d1836225ab01a082c56914c76017c48a) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 70ab709401..2ca60435f4 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=4 +SAMBA_VERSION_RELEASE=5 ######################################################## # For 'pre' releases the version will be # -- cgit From 23dd702fe229327e7b0ffa8dd25662cc51bde2bb Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 24 May 2004 15:26:19 +0000 Subject: r844: bumping version (This used to be commit 9b69451ff2fab70035701a8c261017e087a85ca0) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 2ca60435f4..5a7d9836c8 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=5 # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE=2 ######################################################## # For 'rc' releases the version will be # -- cgit From deb6d8990750a7c176c2a070966a4e54cf893e5a Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 22 Jul 2004 13:43:36 +0000 Subject: r1572: setting version to 3.0.7pre1; I will pull back changes into 3.0.6rc2 manually (This used to be commit 11c6ca1c3c9d3b400f4cebcbf232899bcf4b613f) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 5a7d9836c8..b2951f4211 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=5 +SAMBA_VERSION_RELEASE=7 ######################################################## # For 'pre' releases the version will be # @@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=5 # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=2 +SAMBA_VERSION_PRE_RELEASE=1 ######################################################## # For 'rc' releases the version will be # -- cgit From 4b9cba501e3af35f2bd30e9c6cd03b7f82ea2f75 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Sun, 12 Sep 2004 04:08:20 +0000 Subject: r2292: changing version to 3.0.8pre1 (This used to be commit 98799dc78236a76506d2848b7434bd521c9aca8f) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index b2951f4211..8fbeed3b4a 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=7 +SAMBA_VERSION_RELEASE=8 ######################################################## # For 'pre' releases the version will be # -- cgit From 31441aaa137145511a2c09dd540d46876df56701 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 1 Oct 2004 20:34:12 +0000 Subject: r2768: BUG 1519: save the hostname used in the open_printer_ex() for later reuse when filling in the spolss replies (also gets rid of get_called_name() (This used to be commit 57db8ca91f52329c7f8985c04463b6b69015b0c4) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 8fbeed3b4a..0f2d88c66f 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=8 # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE=2 ######################################################## # For 'rc' releases the version will be # -- cgit From 80a5b023267e45b58e7a3fe3b495d6317943080b Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 11 Nov 2004 20:41:28 +0000 Subject: r3685: setting the 3.0 branch to 3.0.10pre1-svn (This used to be commit 5dec4cdf5ac8795f723bbd8195df7b84aaf8d594) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 0f2d88c66f..83b019fdc7 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=8 +SAMBA_VERSION_RELEASE=10 ######################################################## # For 'pre' releases the version will be # @@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=8 # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=2 +SAMBA_VERSION_PRE_RELEASE=1 ######################################################## # For 'rc' releases the version will be # -- cgit From 6d3abcf3ab8a4b232593529c2a79c264e3cd8d87 Mon Sep 17 00:00:00 2001 From: John Terpstra Date: Tue, 14 Dec 2004 23:05:27 +0000 Subject: r4208: Set version to 3.0.11 (This used to be commit 8622fdcc50dfb4fa09c9b3dff2140a68454d3146) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 83b019fdc7..075cf712c1 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=10 +SAMBA_VERSION_RELEASE=11 ######################################################## # For 'pre' releases the version will be # -- cgit From 0b18a471bc8411f2248b2082f11633e4aa5cef71 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 23 Dec 2004 22:03:29 +0000 Subject: r4350: bumping version to 3.0.11pre2 (This used to be commit 8675b41d336df3030deeda45f1379835002f883c) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 075cf712c1..75ce00d15c 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=11 # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE=2 ######################################################## # For 'rc' releases the version will be # -- cgit From a98e668058f4831379350029183c9068b4d52ff1 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 26 Jan 2005 20:48:21 +0000 Subject: r5020: bumping the 3.0 tree to 3.0.12pre1 since there will not be a full sync for the 3.0.11rc1 release (This used to be commit c0e292e491c684b8ce19096e55338a27161c0a49) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 75ce00d15c..31fe471547 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=11 +SAMBA_VERSION_RELEASE=12 ######################################################## # For 'pre' releases the version will be # @@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=11 # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=2 +SAMBA_VERSION_PRE_RELEASE=1 ######################################################## # For 'rc' releases the version will be # -- cgit From c7a00987e3c8b02e82142be16658d339f9b9dcd2 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 25 Feb 2005 15:56:13 +0000 Subject: r5562: * bump version to 3.0.12pre2 * change special character in gd's valid workstation check to a '+' to be more in line with the characters used by valid users (This used to be commit 8bff0486508b9952c192345302b9313ac0b2270e) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 31fe471547..1e67d25e21 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=12 # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE=2 ######################################################## # For 'rc' releases the version will be # -- cgit From 198c8071b8af5d117db25b1cd2f036938594ca8b Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 11 Mar 2005 10:53:22 +0000 Subject: r5740: setting version in 3.0 development branch to 3.0.13pre1 (This used to be commit 81651b4d8b5050a80fd28a36dc922d9fed51ade6) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 1e67d25e21..3dbdd8649e 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=12 +SAMBA_VERSION_RELEASE=13 ######################################################## # For 'pre' releases the version will be # @@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=12 # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=2 +SAMBA_VERSION_PRE_RELEASE=1 ######################################################## # For 'rc' releases the version will be # -- cgit From 61179e545ed0edfa086fdf0c3e3d715c897e07b2 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 21 Mar 2005 19:07:40 +0000 Subject: r5926: setting version to 3.0.14pre1-svn (This used to be commit 59b07eb012a52af142156912ce1f2d9ea82af81e) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 3dbdd8649e..036bf7d741 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=13 +SAMBA_VERSION_RELEASE=14 ######################################################## # For 'pre' releases the version will be # -- cgit From 380979282f2354b56da4a2f2ac39d44a8cedbe0e Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 11 Apr 2005 00:15:28 +0000 Subject: r6290: and now the development tree becomes 3.0.15pre1 (This used to be commit 5ea3fdff1b2781322a048e9c1334be5fa7f9a1f8) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 036bf7d741..a00b1a6630 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=14 +SAMBA_VERSION_RELEASE=15 ######################################################## # For 'pre' releases the version will be # -- cgit From 40062fbcde9ca594495bc5b1adbba45790498500 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 12 Apr 2005 06:47:04 +0000 Subject: r6311: setting version to 3.0.15pre2 (This used to be commit 005427f73f4438bffc0d8d085f4b40a634e3f381) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index a00b1a6630..1b137d1090 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=15 # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE=2 ######################################################## # For 'rc' releases the version will be # -- cgit From ae21b39a9bcb52e5d3eb2e1b1f6170639e63d980 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 26 Apr 2005 15:14:15 +0000 Subject: r6493: we're at 3.0.15pre3 now (This used to be commit d92e9b1def29333810c792da8a218169b8dbbe4f) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 1b137d1090..242e3be7a1 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=15 # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=2 +SAMBA_VERSION_PRE_RELEASE=3 ######################################################## # For 'rc' releases the version will be # -- cgit From f24d88cf9da46680d52b42b92bd484e7b09ce99b Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 31 May 2005 13:46:45 +0000 Subject: r7139: trying to reduce the number of diffs between trunk and 3.0; changing version to 3.0.20pre1 (This used to be commit 9727d05241574042dd3aa8844ae5c701d22e2da1) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 242e3be7a1..96acc9a178 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=15 +SAMBA_VERSION_RELEASE=20 ######################################################## # For 'pre' releases the version will be # @@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=15 # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=3 +SAMBA_VERSION_PRE_RELEASE=1 ######################################################## # For 'rc' releases the version will be # -- cgit From f88cc52970891a73834b368963b5e59224166a1c Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 24 Jun 2005 21:40:56 +0000 Subject: r7887: 3.0.20pre2-SVN (This used to be commit 388ade15d38ba215a8294711142db59849c51bab) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 96acc9a178..5c3a1e6d04 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=20 # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE=2 ######################################################## # For 'rc' releases the version will be # -- cgit From bff06d34ca63cf23bce1fcb17d183608020d6cc7 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 11 Jul 2005 20:05:00 +0000 Subject: r8330: moving onto 3.0.20rc1-SVN (This used to be commit ea91ee68adb3bd6c07b2556f23a231786d53312d) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 5c3a1e6d04..303ad3dfcf 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -29,7 +29,7 @@ SAMBA_VERSION_RELEASE=20 # 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 # @@ -39,7 +39,7 @@ SAMBA_VERSION_PRE_RELEASE=2 # e.g. SAMBA_VERSION_RC_RELEASE=1 # # -> "3.0.0rc1" # ######################################################## -SAMBA_VERSION_RC_RELEASE= +SAMBA_VERSION_RC_RELEASE=1 ######################################################## # To mark SVN snapshots this should be set to 'yes' # -- cgit From 910f3dd3480248ff97454169836b799ab8be22b1 Mon Sep 17 00:00:00 2001 From: Lars Müller Date: Thu, 4 Aug 2005 02:59:19 +0000 Subject: r9038: Revert svn rev 414. Discussed with Jerry and Metze. We need the option to add an 'a' if we're already in pre or rc state with the next release. Bugzilla Bug 2618 (This used to be commit 26bf1d223efd011ca7c4d5c7d5de23d0f9ad0823) --- source3/VERSION | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 303ad3dfcf..1afddaa901 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -21,6 +21,18 @@ SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 SAMBA_VERSION_RELEASE=20 +######################################################## +# If a official release has a serious bug # +# a security release will have 'a' sufffix # +# # +# so SAMBA's version will be # +# .. # +# # +# e.g. SAMBA_VERSION_PRE_RELEASE=a # +# -> "2.2.8a" # +######################################################## +SAMBA_VERSION_REVISION= + ######################################################## # For 'pre' releases the version will be # # # -- cgit From b94f17226425a2aa1c80911695b85e9df1db2708 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Thu, 4 Aug 2005 15:07:17 +0000 Subject: r9057: fix cut-and-paste error (This used to be commit 7e7e54259a49f97a0c099d984a8b705c4e0fd26d) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 1afddaa901..a7ca54ae5d 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -28,7 +28,7 @@ SAMBA_VERSION_RELEASE=20 # so SAMBA's version will be # # .. # # # -# e.g. SAMBA_VERSION_PRE_RELEASE=a # +# e.g. SAMBA_VERSION_REVISION=a # # -> "2.2.8a" # ######################################################## SAMBA_VERSION_REVISION= -- cgit From 52cd17689159430d3ccb45b21de53e604708454e Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 5 Aug 2005 00:59:23 +0000 Subject: r9087: change version to 3.0.21pre1 since I will start cherry picking patches for the final 3.0.20 (This used to be commit bfc43a8c75e5af9cc04dea44c36bdc22ee358336) --- source3/VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index a7ca54ae5d..7e027ab538 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=20 +SAMBA_VERSION_RELEASE=21 ######################################################## # If a official release has a serious bug # @@ -41,7 +41,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE= +SAMBA_VERSION_PRE_RELEASE=1 ######################################################## # For 'rc' releases the version will be # @@ -51,7 +51,7 @@ SAMBA_VERSION_PRE_RELEASE= # e.g. SAMBA_VERSION_RC_RELEASE=1 # # -> "3.0.0rc1" # ######################################################## -SAMBA_VERSION_RC_RELEASE=1 +SAMBA_VERSION_RC_RELEASE= ######################################################## # To mark SVN snapshots this should be set to 'yes' # -- cgit From 242ec03ff2d5fdb64d3fe5506e57dafa7cc38c92 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 9 Nov 2005 02:13:53 +0000 Subject: r11591: bumping version 3.0.22pre1 (This used to be commit c1a4329833de01456e0df4abbe7c43e97578ae6a) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 7e027ab538..5e2b8df386 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=21 +SAMBA_VERSION_RELEASE=22 ######################################################## # If a official release has a serious bug # -- cgit From f78f5cc8a1f7d86048b474f42a0dde02e8e01d85 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 9 Nov 2005 18:33:37 +0000 Subject: r11613: fixing versions (This used to be commit b50a264f01c5af2d6cb0eed68b5292818ee06a59) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 5e2b8df386..34c4859861 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=22 +SAMBA_VERSION_RELEASE=21 ######################################################## # If a official release has a serious bug # @@ -41,7 +41,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE=3 ######################################################## # For 'rc' releases the version will be # -- cgit From 5bc7b91456fbd75bce02dca9ec2a893bcca9a7bf Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 2 Dec 2005 19:30:01 +0000 Subject: r12027: changing version to 3.0.22pre1 since 3.0.21 is frozen now (This used to be commit 608f8c3da8c708ec291fdb5faa3ea14303f59750) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 34c4859861..5e2b8df386 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=21 +SAMBA_VERSION_RELEASE=22 ######################################################## # If a official release has a serious bug # @@ -41,7 +41,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=3 +SAMBA_VERSION_PRE_RELEASE=1 ######################################################## # For 'rc' releases the version will be # -- cgit From 19907887fcc1fa96f947298da752f410eb23ad1e Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 23 Jan 2006 22:02:52 +0000 Subject: r13093: adding vendor patch level string as announced on samba-technical ml (This used to be commit d40f06018b9197c35a10cc9ab284dd596244f47b) --- source3/VERSION | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 5e2b8df386..5119a95401 100644 --- 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 # @@ -91,3 +97,4 @@ SAMBA_VERSION_IS_SVN_SNAPSHOT=yes # -> "CVS 3.0.0rc2-VendorVersion" # ######################################################## SAMBA_VERSION_VENDOR_SUFFIX= +SAMBA_VENDOR_PATCH= -- cgit From 6c9eaa6880897aabbc56ad3d7bd73dfc69f926f9 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Sun, 2 Apr 2006 06:25:11 +0000 Subject: r14855: Various fixes: * depreacte 'acl group control' after discussion with Jeremy and implement functionality as part of 'dos filemode' * fix winbindd on a non-member server to expand local groups * prevent code previously only used by smbd from blindly turning _NO_WINBINDD back on (This used to be commit 4ab372f4cab22225716b5c9a9a08f0c1dbc9928d) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 5119a95401..e083b5d930 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=22 +SAMBA_VERSION_RELEASE=23 ######################################################## # If a official release has a serious bug # -- cgit From 4af4ccc1ab448e902d9c3949ce284923a490a73c Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 20 Apr 2006 22:15:17 +0000 Subject: r15154: bump version to 3.0.23pre2 (This used to be commit d6940c09cc9b9ac8bd4cba95ca382fa63c19748b) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index e083b5d930..d1f582d401 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -47,7 +47,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE=2 ######################################################## # For 'rc' releases the version will be # -- cgit From 668727d035e14eb03115007696f62a59bb1418d5 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 13 Jun 2006 15:57:00 +0000 Subject: r16195: starting development for 3.0.24pre1 (This used to be commit 1b64f9a48bbb5a88c2029585e208865b41f2f423) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index d1f582d401..2976298888 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=23 +SAMBA_VERSION_RELEASE=24 ######################################################## # If a official release has a serious bug # @@ -47,7 +47,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=2 +SAMBA_VERSION_PRE_RELEASE=1 ######################################################## # For 'rc' releases the version will be # -- cgit From d596aa931b9d7e27718ed4d63006d736175d2b8d Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 17 Nov 2006 23:31:45 +0000 Subject: r19764: set version in 3.0 branch to 3.0.25 (This used to be commit d7179d945c24f1aa4fff243cc6c29a5545ce692a) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 2976298888..2728e181aa 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=24 +SAMBA_VERSION_RELEASE=25 ######################################################## # If a official release has a serious bug # -- cgit From 6dcf122d4a97529fa05a4415b090a97f59e69b60 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 5 Feb 2007 17:20:15 +0000 Subject: r21157: this is 3.0.26 trunk metze (This used to be commit 04feb8e39c3f8a3fecd5cac63e64c38cfc313c95) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 2728e181aa..b66432148c 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=25 +SAMBA_VERSION_RELEASE=26 ######################################################## # If a official release has a serious bug # -- cgit From aa454619a2e99e9d7a6760e46ae0b3360c0ece1a Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 3 May 2007 17:05:25 +0000 Subject: r22654: And this is now Samba 3.0.27pre1-SVN (This used to be commit 435a6e5e82b5910acc116f211f1dfc3fe32a43ca) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index b66432148c..3b81224ea2 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=26 +SAMBA_VERSION_RELEASE=27 ######################################################## # If a official release has a serious bug # -- cgit From 70f2baf656075aeec8a0fc4643f61074b6ab5e9b Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 9 Jul 2007 18:26:53 +0000 Subject: r23776: Setting version in 3.2 branch to 3.2.1pre1-SVN Setting version in 3.2.0 branch to 3.2.0pre1-SVN (This used to be commit 240b19c8caf3af35189e70e056c480112f0d5077) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 3b81224ea2..4635bcd169 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -24,8 +24,8 @@ # -> "3.0.0" # ######################################################## SAMBA_VERSION_MAJOR=3 -SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=27 +SAMBA_VERSION_MINOR=2 +SAMBA_VERSION_RELEASE=1 ######################################################## # If a official release has a serious bug # -- cgit From e5a951325a6cac8567af3a66de6d2df577508ae4 Mon Sep 17 00:00:00 2001 From: "Gerald (Jerry) Carter" Date: Wed, 10 Oct 2007 15:34:30 -0500 Subject: [GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch. (This used to be commit 5c6c8e1fe93f340005110a7833946191659d88ab) --- source3/VERSION | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 4635bcd169..72764299f5 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,11 +25,10 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=2 -SAMBA_VERSION_RELEASE=1 +SAMBA_VERSION_RELEASE=0 ######################################################## -# If a official release has a serious bug # -# a security release will have 'a' sufffix # +# Bug fix releases use a letter for the patch revision # # # # so SAMBA's version will be # # .. # -- cgit From a839f84e1cb61d34e9dd6a77a7fd2f195908a590 Mon Sep 17 00:00:00 2001 From: "Gerald (Jerry) Carter" Date: Wed, 10 Oct 2007 19:16:45 -0500 Subject: Set -test in the vendor version (This used to be commit 1e048ef75eba99d4bce9e44a4e2a3b95657e2e3d) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 72764299f5..5e10dc79f3 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -46,7 +46,7 @@ SAMBA_VERSION_REVISION= # e.g. SAMBA_VERSION_PRE_RELEASE=1 # # -> "2.2.9pre1" # ######################################################## -SAMBA_VERSION_PRE_RELEASE=1 +SAMBA_VERSION_PRE_RELEASE=2 ######################################################## # For 'rc' releases the version will be # @@ -95,5 +95,5 @@ SAMBA_VERSION_IS_SVN_SNAPSHOT=yes # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() # # -> "CVS 3.0.0rc2-VendorVersion" # ######################################################## -SAMBA_VERSION_VENDOR_SUFFIX= +SAMBA_VERSION_VENDOR_SUFFIX="-test" SAMBA_VENDOR_PATCH= -- cgit From ad8aacfbf1a7981c4654a2f603c95904685f6895 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 11 Oct 2007 10:53:55 +0200 Subject: SAMBA_VERSION_VENDOR_SUFFIX doesn't need an extra '-' metze (This used to be commit b03b4489c27ed0bfd6fd13d4e6d76206e470dcc4) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 5e10dc79f3..4648075592 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -95,5 +95,5 @@ SAMBA_VERSION_IS_SVN_SNAPSHOT=yes # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() # # -> "CVS 3.0.0rc2-VendorVersion" # ######################################################## -SAMBA_VERSION_VENDOR_SUFFIX="-test" +SAMBA_VERSION_VENDOR_SUFFIX="test" SAMBA_VENDOR_PATCH= -- cgit From edfcfefa37bf948c990e7ad3a1aea1dd4c3cea09 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 11 Oct 2007 12:27:38 +0200 Subject: prepare the mkversion.sh infrastructure for git branches in the build-farm metze (This used to be commit 1bf4c7fb2012a81e0b4e3d601a4df42d1113f5ef) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 4648075592..858b627143 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -68,7 +68,7 @@ SAMBA_VERSION_RC_RELEASE= # 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 can be set by vendors if they want... # -- cgit From 876ae0a830c7d235313ca9a467f1ad58f4286343 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 12 Oct 2007 14:39:35 +0200 Subject: Remove superfluous quotation marks around samba version vendor suffix. Michael (This used to be commit 016795c550ee0b78fa46c508703fb5e1e40d8f36) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 858b627143..d34a625f0d 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -95,5 +95,5 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() # # -> "CVS 3.0.0rc2-VendorVersion" # ######################################################## -SAMBA_VERSION_VENDOR_SUFFIX="test" +SAMBA_VERSION_VENDOR_SUFFIX=test SAMBA_VENDOR_PATCH= -- cgit From d93f851ec1aec185a564f5ebbdf75189e50247a3 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 12 Oct 2007 16:15:28 +0200 Subject: Revert "Remove superfluous quotation marks around samba version" This reverts commit 016795c550ee0b78fa46c508703fb5e1e40d8f36. These quotation marks are not superfluous at all... sorry! Michael (This used to be commit 3a1b0965229facdeab8ddc68e72bd4c5bbec70ac) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index d34a625f0d..858b627143 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -95,5 +95,5 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() # # -> "CVS 3.0.0rc2-VendorVersion" # ######################################################## -SAMBA_VERSION_VENDOR_SUFFIX=test +SAMBA_VERSION_VENDOR_SUFFIX="test" SAMBA_VENDOR_PATCH= -- cgit From 69c6f16e31d0adfc7efb077e09afbb8ff5fb2b0f Mon Sep 17 00:00:00 2001 From: "Gerald (Jerry) Carter" Date: Sun, 21 Oct 2007 12:32:06 -0500 Subject: Correct VERSION and version.c to use SAMBA_VERSION_VENDOR_PATCH which is used by mkversion.sh. (This used to be commit a62c7f9350322ab435244eafe6053fd5ee618973) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 858b627143..c97db4b04e 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -96,4 +96,4 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes # -> "CVS 3.0.0rc2-VendorVersion" # ######################################################## SAMBA_VERSION_VENDOR_SUFFIX="test" -SAMBA_VENDOR_PATCH= +SAMBA_VERSION_VENDOR_PATCH= -- cgit From fe063b7bf5a05cb4f17a093f867801d93459d8d3 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Sun, 23 Mar 2008 07:28:13 +0100 Subject: VERSION: Update pre release number. Karolin (This used to be commit 4e609ffb2f9983362f817c1346e0a4116d2dd74a) --- source3/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index c97db4b04e..3469a25d52 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -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=3 ######################################################## # For 'rc' releases the version will be # -- cgit From c7a42797c8a43f3c9f41430a5b8168804160dff7 Mon Sep 17 00:00:00 2001 From: "Gerald W. Carter" Date: Fri, 25 Apr 2008 08:35:27 -0500 Subject: Setting version to 3.3.0pre1 (This used to be commit 4dd00987be6ac0dbc706d9148472846d95f3b882) --- source3/VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 3469a25d52..c8206c804f 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -24,7 +24,7 @@ # -> "3.0.0" # ######################################################## SAMBA_VERSION_MAJOR=3 -SAMBA_VERSION_MINOR=2 +SAMBA_VERSION_MINOR=3 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=3 +SAMBA_VERSION_PRE_RELEASE=1 ######################################################## # For 'rc' releases the version will be # -- cgit From 2a8ebdca535aed431d51270a2bdcafce0b55bb12 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 17 Jul 2008 12:25:31 +0200 Subject: Simplify samba_version_string. This adds a new macro for a vender version function which will be returned by the samba_version_string() function if defined. Signed-off-by: Andreas Schneider Signed-off-by: Stefan Metzmacher (This used to be commit 8b9301fbc73f28c657ec81c605760a0ff7a1973a) --- source3/VERSION | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index c8206c804f..758956e9f7 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -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 *) # # # # ..[...]- # # # @@ -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="test" +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="test" -SAMBA_VERSION_VENDOR_PATCH= +SAMBA_VERSION_VENDOR_FUNCTION= -- cgit From 0c0a3892ae40e9c05402301b7109d6dc90f4e38f Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Wed, 13 Aug 2008 15:25:09 +0200 Subject: VERSION: Raise version number. Karolin (This used to be commit 1ed4b2151e60050455e0b3564afe01b0c030b71e) --- source3/VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/VERSION') diff --git a/source3/VERSION b/source3/VERSION index 758956e9f7..180d04e882 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -24,7 +24,7 @@ # -> "3.0.0" # ######################################################## SAMBA_VERSION_MAJOR=3 -SAMBA_VERSION_MINOR=3 +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=1 +SAMBA_VERSION_PRE_RELEASE= ######################################################## # For 'rc' releases the version will be # @@ -84,7 +84,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes # SAMBA_VERSION_VENDOR_FUNCTION # # # ######################################################## -SAMBA_VERSION_VENDOR_SUFFIX="test" +SAMBA_VERSION_VENDOR_SUFFIX="devel" SAMBA_VERSION_VENDOR_PATCH= ######################################################## -- cgit