Fix server version reporting to be the server package version.

Previously, the server version reported by xdpyinfo and Xorg -version would
bear some vague resemblance to a X.Org katamari version, but in the presence
of modularization (and client-server relationships with different katamari
versions on each side) those numbers don't really make sense.  Instead, just
report the package version.

When branching a stable branch, master's version should be immediately updated
to the endpoint of the stable branch plus a snapshot of 1 (for example,
1.4.0.1 after server-1.4-branch).  The stable branch should then be changed to
RC0 at that time (1.3.99.0, for example).

This scheme was partially attempted for server 1.3, but lacked the appropriate
master updates, thus why it had to be revisited now.  While here, we can also
remove a lot of versioning complexity since everything is based on the package
version.
This commit is contained in:
Eric Anholt
2007-09-05 12:34:29 -07:00
parent 6c89d1237c
commit 47300ed2be
4 changed files with 30 additions and 66 deletions

View File

@@ -509,7 +509,7 @@ main(int argc, char *argv[], char *envp[])
}
static int VendorRelease = VENDOR_RELEASE;
static char *VendorString = VENDOR_STRING;
static char *VendorString = VENDOR_NAME;
void
SetVendorRelease(int release)