14 Commits

Author	SHA1	Message	Date
Stefan Metzmacher	1d5646f9ff	r23685: merge from SAMBA_4_0: ... Only use the bzr and git information when there's a .bzr or .git in the top branch directory I use bzr for my home directory and bzr version-info in ~/devel/samba/4.0/samba4-git gives the info about the ~/.bzr branch metze (This used to be commit e4df2e1c2d)	2007-10-10 12:23:45 -05:00
Volker Lendecke	0a754ca75c	r23670: Fix mkversion.sh for the git case: Only use the first line where ... "commit" occurs (This used to be commit 0e9aeec370)	2007-10-10 12:23:44 -05:00
Kai Blin	97746f8db0	r23606: Merge Samba4 mkversion.sh to Samba3. ... (This used to be commit 6566e24c13)	2007-10-10 12:23:35 -05:00
Michael Adam	90ad4eae89	r22401: Add bzr revision+nick support to mkversion.sh. ... The plan is to actually synchronize with SAMBA_4_0's mkversion.sh, which is more elaborate. But there are a few differences in behaviour I still have to check. So I am cheching this here in for a start... Michael (This used to be commit dec7e31f29)	2007-10-10 12:19:32 -05:00
Gerald Carter	7de55b30b7	r13229: * fix bad comparison caught by the AIX compiler in wbinfo code ... * update output from mkversion.sh to include the SAMBA_VENDOR_PATCH (This used to be commit 485f037094)	2007-10-10 11:06:19 -05:00
Gerald Carter	19907887fc	r13093: adding vendor patch level string as announced on samba-technical ml ... (This used to be commit d40f06018b)	2007-10-10 11:06:13 -05:00
Lars Müller	910f3dd348	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 26bf1d223e)	2007-10-10 11:00:24 -05:00
Stefan Metzmacher	0895eae509	r6925: merge rev 6920 from 4_0: ... display the SVN revision in svk build of tree's directly mirrored from samba.org metze (This used to be commit 110c0f6f36)	2007-10-10 10:56:57 -05:00
Stefan Metzmacher	6cc85bbe72	r6354: merge from 4_0 rev 6353: ... we need the english output from the svn commands metze (This used to be commit 6b84f30e3d)	2007-10-10 10:56:38 -05:00
Stefan Metzmacher	b4594cec6e	r824: merge from: SAMBA_4_0: ... use 'Last Change Rev:' instead of 'Revision:' from the svn info output for setting the SVN_REVISION in version.h metze (This used to be commit 7cc35ba066)	2007-10-10 10:51:47 -05:00
Stefan Metzmacher	65d9febf9a	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 25cbca89ba)	2007-10-10 10:51:22 -05:00
Stefan Metzmacher	1cd9d74016	r215: merge over svk fixes from 4_0 ... metze (This used to be commit 2326c9e0a2)	2007-10-10 10:51:14 -05:00
Stefan Metzmacher	f8c418a0af	r208: merge the version schema changes from 4_0 ... metze (This used to be commit 4d9d8e83aa)	2007-10-10 10:51:14 -05:00
Gerald Carter	8bfe26b62d	metze's autogenerate patch for version.h ... (This used to be commit ae452e51b0)	2003-08-20 17:13:38 +00:00