From ef4e5601748b571a40d84608d12e45235987e608 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 (cherry-picked from 1bf4c7fb2012a81e0b4e3d601a4df42d1113f5ef) (This used to be commit 464668b07aded0a299eb49b87b51bb9bf53d2c8d) --- source4/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/VERSION') diff --git a/source4/VERSION b/source4/VERSION index 2f5f7009de..29ff51638e 100644 --- a/source4/VERSION +++ b/source4/VERSION @@ -89,7 +89,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 is for specifying a release nickname # -- cgit From 1f493dccd6d4df150749095a69db92a0c1b86c40 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 10 Jan 2008 19:36:12 +0100 Subject: Set -test in the vendor version metze (This used to be commit 817582a46aed1a3a470477c95671fa25fd9f2f67) --- source4/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/VERSION') diff --git a/source4/VERSION b/source4/VERSION index 29ff51638e..34ccb95b9f 100644 --- a/source4/VERSION +++ b/source4/VERSION @@ -113,5 +113,5 @@ SAMBA_VERSION_RELEASE_NICKNAME= # -> "3.0.0rc2-VendorVersion" # # # ######################################################## -SAMBA_VERSION_VENDOR_SUFFIX= +SAMBA_VERSION_VENDOR_SUFFIX="test" SAMBA_VERSION_VENDOR_PATCH= -- cgit From 256659039affd7ce6a028be661fcc77147c0461e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 10 Jan 2008 20:06:00 +0100 Subject: Revert "Set -test in the vendor version" This needs a bit more work as it's different to samba3... metze This reverts commit 817582a46aed1a3a470477c95671fa25fd9f2f67. (This used to be commit dec016822ce9439b40f3d9403d42ebc76ba2e0e1) --- source4/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/VERSION') diff --git a/source4/VERSION b/source4/VERSION index 34ccb95b9f..29ff51638e 100644 --- a/source4/VERSION +++ b/source4/VERSION @@ -113,5 +113,5 @@ SAMBA_VERSION_RELEASE_NICKNAME= # -> "3.0.0rc2-VendorVersion" # # # ######################################################## -SAMBA_VERSION_VENDOR_SUFFIX="test" +SAMBA_VERSION_VENDOR_SUFFIX= SAMBA_VERSION_VENDOR_PATCH= -- cgit