Index: ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.428
diff -u -r1.428 ChangeLog
--- ChangeLog	4 Oct 2004 15:24:34 -0000	1.428
+++ ChangeLog	4 Oct 2004 21:08:03 -0000
@@ -1,3 +1,9 @@
+2004-10-04  Alexander Gottwald  <ago@freedesktop.org>
+
+	* xc/config/cf/xorg.cf, xc/config/cf/cygwin.cf: 
+	* xc/config/xorgversion.def:
+	Bugzilla #1393: Move xorg version numbers to separate config file
+
 2004-10-04 Vladimir Dergachev <volodya@mindspring.com>
 
        Modified:
Index: config/cf/cygwin.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/cygwin.cf,v
retrieving revision 1.14
diff -u -r1.14 cygwin.cf
--- config/cf/cygwin.cf	3 Sep 2004 16:18:18 -0000	1.14
+++ config/cf/cygwin.cf	4 Oct 2004 21:08:03 -0000
@@ -1,15 +1,17 @@
 /* Cygwin/X vendor strings and version */
+#include "xorgversion.def"
+
 #ifndef CygxVersionMajor
-# define CygxVersionMajor	6
+# define CygxVersionMajor	XORG_VERSION_MAJOR
 #endif
 #ifndef CygxVersionMinor
-# define CygxVersionMinor	8
+# define CygxVersionMinor	XORG_VERSION_MINOR
 #endif
 #ifndef CygxVersionPatch
-# define CygxVersionPatch	0
+# define CygxVersionPatch	XORG_VERSION_PATCH
 #endif
 #ifndef CygxVersionSnap
-# define CygxVersionSnap	0
+# define CygxVersionSnap	XORG_VERSION_SNAP
 #endif
 #ifndef CygxVersionServer
 # define CygxVersionServer	0
Index: config/cf/xorg.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/xorg.cf,v
retrieving revision 1.29
diff -u -r1.29 xorg.cf
--- config/cf/xorg.cf	2 Oct 2004 20:22:42 -0000	1.29
+++ config/cf/xorg.cf	4 Oct 2004 21:08:03 -0000
@@ -11,13 +11,7 @@
 /* Get and set version information. */
 
 #include "date.def"
-
-#define XORG_VERSION_MAJOR  6
-#define XORG_VERSION_MINOR  8
-#define XORG_VERSION_PATCH  1
-#define XORG_VERSION_SNAP   99
-
-#define XORG_DATE "2 October 2004 + cvs"
+#include "xorgversion.def"
 
 #if !defined(XorgVersionString) && \
     defined(XORG_VERSION_MAJOR) && defined(XORG_VERSION_MINOR) && \
Index: config/cf/xorgversion.def
===================================================================
RCS file: config/cf/xorgversion.def
diff -N config/cf/xorgversion.def
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ config/cf/xorgversion.def	4 Oct 2004 21:08:03 -0000
@@ -0,0 +1,6 @@
+#define XORG_VERSION_MAJOR  6
+#define XORG_VERSION_MINOR  8
+#define XORG_VERSION_PATCH  1
+#define XORG_VERSION_SNAP   99
+
+#define XORG_DATE "2 October 2004 + cvs"
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imakefile,v
retrieving revision 1.3
diff -u -r1.3 config/cf/Imakefile
--- config/cf/Imakefile	9 Aug 2004 22:37:21 -0000	1.3
+++ config/cf/Imakefile	13 Oct 2004 16:33:15 -0000
@@ -26,7 +26,8 @@
 xorgsite.def \
 $(VERSIONDEFFILES) \
 $(HOSTDEFFILES) \
-site.def
+site.def \
+xorgversion.def  
 
 RULEFILES = \
 Imake.rules \