diff options
| author | Kevin E Martin <kem@kem.org> | 2004-09-03 16:18:18 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2004-09-03 16:18:18 +0000 |
| commit | f4da5e087a161e7ed5720aa8e7dddcb1958e8996 (patch) | |
| tree | ea00e24c68ba33eb11d0f05fbe4ae88dc1a72a17 | |
| parent | 98c41c44c16ef323ca27fb4a3bbf67a2c372c4c8 (diff) | |
First set of documentation updates.
Include more correct fix for rootless interaction with damage (Bug #1168,
Keith Packard).
| -rw-r--r-- | X11.tmpl | 4 | ||||
| -rw-r--r-- | cygwin.cf | 6 | ||||
| -rw-r--r-- | lnxdoc.rules | 10 | ||||
| -rw-r--r-- | lnxdoc.tmpl | 6 | ||||
| -rw-r--r-- | xorg.cf | 10 |
5 files changed, 21 insertions, 15 deletions
@@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.33 2004/09/02 01:10:28 kem Exp $ +XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.34 2004/09/02 05:50:38 kem Exp $ XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM @@ -45,7 +45,7 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ # if defined XorgVersionString # define XOrgReleaseString Release XorgVersionString # else -# define XOrgReleaseString Release 6.7 +# define XOrgReleaseString Release 6.8 # endif #endif @@ -3,13 +3,13 @@ # define CygxVersionMajor 6 #endif #ifndef CygxVersionMinor -# define CygxVersionMinor 7 +# define CygxVersionMinor 8 #endif #ifndef CygxVersionPatch -# define CygxVersionPatch 99 +# define CygxVersionPatch 0 #endif #ifndef CygxVersionSnap -# define CygxVersionSnap 904 +# define CygxVersionSnap 0 #endif #ifndef CygxVersionServer # define CygxVersionServer 0 diff --git a/lnxdoc.rules b/lnxdoc.rules index 6561e5d..a538920 100644 --- a/lnxdoc.rules +++ b/lnxdoc.rules @@ -59,7 +59,7 @@ textfile: sgmlfile $(SGMLDEPENDS) @@\ set -x;\ @@\ RemoveFile($$BASE.latin1);\ @@\ $(SGMLFMTCMD) -f latin1 -b -n sgmlfile && \ @@\ - $(CVSIDENTFIX) < $$BASE.latin1 | $(XFREE86IDENTFIX) > _$@ && $(MV) _$@ $@ && \ @@\ + $(CVSIDENTFIX) < $$BASE.latin1 | $(XORGIDENTFIX) | $(XFREE86IDENTFIX) > _$@ && $(MV) _$@ $@ && \ @@\ RemoveFile($$BASE.latin1)) @@\ @@\ LinuxDocInstall(textfile,$(XFREE86DOCDIR)) @@\ @@ -103,11 +103,11 @@ update.docs:: textfile @@\ fi; \ @@\ cp textfile dstdir/dstfile; \ @@\ echo "" >> dstdir/dstfile; \ @@\ - echo "\$$XFree86\$$" >> dstdir/dstfile; \ @@\ + echo "\$$XdotOrg\$$" >> dstdir/dstfile; \ @@\ else \ @@\ $(RM) __tmp1__ __tmp2__; \ @@\ - fgrep -v "\$$XFree86:" textfile > __tmp1__; \ @@\ - fgrep -v "\$$XFree86:" dstdir/dstfile > __tmp2__; \ @@\ + fgrep -v "\$$XdotOrg:" textfile > __tmp1__; \ @@\ + fgrep -v "\$$XdotOrg:" dstdir/dstfile > __tmp2__; \ @@\ if diff -B __tmp1__ __tmp2__ > /dev/null 2>&1; then :; \ @@\ else set -x; \ @@\ if [ "$(FOLLOWLINK)" = no ]; then \ @@\ @@ -115,7 +115,7 @@ update.docs:: textfile @@\ fi; \ @@\ cp textfile dstdir/dstfile ; \ @@\ echo "" >> dstdir/dstfile; \ @@\ - echo "\$$XFree86"": \$$" >> dstdir/dstfile; \ @@\ + echo "\$$XdotOrg"": \$$" >> dstdir/dstfile; \ @@\ fi; \ @@\ fi; \ @@\ fi @@\ diff --git a/lnxdoc.tmpl b/lnxdoc.tmpl index 25e12bd..af5faf3 100644 --- a/lnxdoc.tmpl +++ b/lnxdoc.tmpl @@ -18,6 +18,11 @@ XCOMM -e '/\$$\XFree86:/s/\$$/Generated from /' #endif +#ifndef XorgIdentFix +#define XorgIdentFix sed -e '/\$$\XdotOrg:/s/....\/..\/.. ..:..:.. *//' \ + -e '/\$$\XdotOrg:/s/\$$/Generated from /' +#endif + #ifndef CVSIdentFix #define CVSIdentFix sed -e '/\$$\Id:/s/....\/..\/.. ..:..:.. *//' \ -e '/\$$\Id:/s/\$$/Generated from /' @@ -65,6 +70,7 @@ XCOMM XFREE86IDENTFIX = XFree86IdentFix + XORGIDENTFIX = XorgIdentFix CVSIDENTFIX = CVSIdentFix DVIPS = DvipsCmd DVIPSOPTIONS = DvipsOptions @@ -1,4 +1,4 @@ -XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.24 2004/08/28 14:48:12 kem Exp $ +XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.25 2004/09/02 08:48:41 kem Exp $ /* * This configuration file contains all of the configuration * information for the Xorg based X Servers. @@ -13,11 +13,11 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ #include "date.def" #define XORG_VERSION_MAJOR 6 -#define XORG_VERSION_MINOR 7 -#define XORG_VERSION_PATCH 99 -#define XORG_VERSION_SNAP 904 +#define XORG_VERSION_MINOR 8 +#define XORG_VERSION_PATCH 0 +#define XORG_VERSION_SNAP 0 -#define XORG_DATE "02 September 2004" +#define XORG_DATE "08 September 2004" #if !defined(XorgVersionString) && \ defined(XORG_VERSION_MAJOR) && defined(XORG_VERSION_MINOR) && \ |