xserver-xorg-video-vga: Changes to 'debian-experimental'
ChangeLog | 226 ++++++++++++++++++++++++++++++++++++++++++--------
debian/changelog | 34 +++++--
debian/control | 15 +--
debian/rules | 2
debian/xsfbs/xsfbs.mk | 9 -
man/vga.man | 6 -
6 files changed, 235 insertions(+), 57 deletions(-)
New commits:
commit 53b87f77a4668b4d91711684425137bbd0d8702c
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Sep 9 21:40:21 2007 -0400
* Build against and build-dep on xserver 1.4
* Bump standards version to 3.7.2.2. No changes needed.
diff --git a/debian/changelog b/debian/changelog
index e08e8ee..687940f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-vga (1:4.1.0-6) UNRELEASED; urgency=low
+xserver-xorg-video-vga (1:4.1.0-6) experimental; urgency=low
[ Julien Cristau ]
* Add link to xserver-xorg-core bug script, so that bugreports contain
@@ -17,7 +17,11 @@ xserver-xorg-video-vga (1:4.1.0-6) UNRELEASED; urgency=low
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 30 Apr 2007 03:19:38 +0200
+ [ David Nusinow ]
+ * Build against and build-dep on xserver 1.4
+ * Bump standards version to 3.7.2.2. No changes needed.
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 09 Sep 2007 21:38:19 -0400
xserver-xorg-video-vga (1:4.1.0-5) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 2892865..6495129 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
-Standards-Version: 3.6.1
+Standards-Version: 3.7.2.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vga
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vga.git
commit 076d276ebb389e7f69fdfa211ef0137deeae76c5
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Apr 30 03:22:28 2007 +0200
Update upstream ChangeLog
diff --git a/ChangeLog b/ChangeLog
index dd887ea..61a07d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,51 +1,211 @@
-2006-03-09 Luc Verhaegen <libv@skynet.be>
+commit c5665497bc393b83951a263926e0d9ee27f3d573
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Mar 1 11:10:05 2007 -0800
- * src/generic.c: (GenericPreInit), (GenericSetMode),
- (GenericValidMode):
+ Replace references to XFree86/XF86Config in man page
- - Stop using non-programmable dotclock infrastructure. This is worked
- around quite easily here, by limiting the clockRange to the two VGA
- standard clocks, with CLOCK_TOLERANCE. This happily removed
- the dependence on the nasty xf86GetClocks as well.
- - Set the CS bits directly, don't rely on DisplayModePtr->ClockIndex.
- - Add DisplayModePtr->Crtc* checking.
+commit ab8f09a1fa93300e9634989a153b7d219ba767d6
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 21:48:45 2006 +0000
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Unlibcwrap. Bump server version requirement. Bump to 4.1.0.
- * configure.ac:
- Update package version for X11R7 release.
+commit a44c7ccb8af0d970cdc204393fb4701541375862
+Author: Luc Verhaegen <libv@skynet.be>
+Date: Thu Mar 9 00:08:19 2006 +0000
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ VGA driver cleanups preparing for the removal of non-programmable dotclock
+ infrastructure.
+ - Stop using non-programmable dotclock infrastructure. This is worked
+ around quite easily here, by limiting the clockRange to the two VGA
+ standard clocks, with CLOCK_TOLERANCE. This happily removed the
+ dependence on the nasty xf86GetClocks as well.
+ - Set the CS bits directly, don't rely on DisplayModePtr->ClockIndex.
+ - Add DisplayModePtr->Crtc* checking. Functional changes? None. 320x200 is
+ still the only mode possible; banked memory constraints still aren't
+ handled properly.
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+commit d0e3efd151bdbedf5b6dc1b1d04ac078327361db
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:04 2005 +0000
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update package version for X11R7 release.
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+commit b9cca73e31025f0ffdaf8fa4991065403f95bf01
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:56 2005 +0000
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Stub COPYING files
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+commit 4053cca49cf634bedd085afd1490005acc8628ee
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:21 2005 +0000
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update package version number for final X11R7 release candidate.
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+commit ebf6cdbabd87e8a9e38dcf01a68dab34f1ddc7e3
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:40 2005 +0000
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
- * configure.ac:
- Only build dlloader modules by default.
+commit f175155bc699c49f68cc210cf3aa67b0422232c9
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:37 2005 +0000
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update package version number for X11R7 RC3 release.
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+commit 2f8ff2c0152d5e70b3ddf76d5dbdda00ab8ba42c
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:11 2005 +0000
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Remove extraneous AC_MSG_RESULT.
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+commit eff44d08a473505be9cd7b7c476150119fb7fe7c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:30:06 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit edcc9cfbde82edd7271a30d9f54a4c9afaa3ed31
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:15 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit ea43f587c908ef39876df5273806cfb40d76468a
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:22 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 38d17d63b8bd9e044898b0ead2102e4911084612
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:22 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit e598a23978598c2fbeca053e4d227da45029ae72
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:57 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit a7a025f98f83891f9c73d0f0bf6f6f14e29bedee
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:06 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 98508100355875f892e5f75c0ad3b6003763eb2c
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:01:55 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 4647a7eba57743a82f69496e7ebe1a5185b1d93d
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:38 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit a7d816d10c5118d88777a0c03af45f397af33bac
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:09:08 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit cbfc05826bafab21225e87d3742dca11a350b4e2
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:55 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 086e2b6b1c3000aba13a07cb7ebfe71ebf4d7943
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:46 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit f12e5d9884e155fb85ddcb3743db5862351492d4
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 26 23:52:21 2005 +0000
+
+ Build system for vga
+
+commit 20687f8b578e989f5a62373fc7e4d2545436df32
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:30:07 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit 38dac1c4fcacf74b20eccb84b932f229fdd8e915
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:17:00 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 358885f2fec6365f8e061fd5b547e95229bc45f5
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:23:27 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 23a8e1b91ca8b618f4a55d028499c7bd88c81424
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:53:24 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 3322eede2037b9684e5db0be1ebc11d6a1cca3f8
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:41 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit fc95f2e8064be20ff2a65cb1fa88dfead08a616d
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:28 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 88f1f75e595d8d9567cb7cea037449d35db900c4
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:56 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit b21ec4f9640e1dd4a43449d4db41bf2ea56a7aee
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:28 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 5d1956bde7ae8ae0d54a4ff649465fbd3f1bc01d
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:43 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 5894f0bff49be8a67a8adff4368fe52c6e8f869b
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 8ab74f7dc71060c6c9e7d8b62c96dd322c5f5f51
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
commit 5ad7852c89355d31e1268c23f61877a5722be5e0
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Apr 30 03:20:38 2007 +0200
Pull upstream manpage fix c5665497bc393b83951a263926e0d9ee27f3d573
diff --git a/debian/changelog b/debian/changelog
index 6d57b04..e08e8ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-vga (1:4.1.0-6) UNRELEASED; urgency=low
* Replaces/Conflicts: xserver-xorg-driver-vga.
[ Brice Goglin ]
+ * Pull upstream manpage fix c5665497bc393b83951a263926e0d9ee27f3d573
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
@@ -16,7 +17,7 @@ xserver-xorg-video-vga (1:4.1.0-6) UNRELEASED; urgency=low
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 30 Apr 2007 03:18:26 +0200
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 30 Apr 2007 03:19:38 +0200
xserver-xorg-video-vga (1:4.1.0-5) experimental; urgency=low
commit ca08f3d2338683a8673149b214eb9da6f4bb9046
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Apr 30 03:19:00 2007 +0200
Miscellaneous fixes in debian/control and debian/rules.
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
* Add XS-Vcs-*.
* Add a link to www.X.org and a reference to the xf86-video-vga
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
diff --git a/debian/changelog b/debian/changelog
index 46aae44..6d57b04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,16 @@ xserver-xorg-video-vga (1:4.1.0-6) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-vga.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 14:42:05 +0300
+ [ Brice Goglin ]
+ * Install the upstream changelog.
+ * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
+ (needed to let xsfbs get access to serverminver).
+ * Add XS-Vcs-*.
+ * Add a link to www.X.org and a reference to the xf86-video-vga
+ module in the long description.
+ * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 30 Apr 2007 03:18:26 +0200
xserver-xorg-video-vga (1:4.1.0-5) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 67342a7..2892865 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xserver-xorg-video-vga
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.0), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
Standards-Version: 3.6.1
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vga
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vga.git
Package: xserver-xorg-video-vga
Architecture: any
@@ -22,8 +24,8 @@ Description: X.Org X server -- VGA display driver
at a better resolution and colour depth.
.
More information about X.Org can be found at:
+ <URL:http://www.X.org>
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
- This module can be found as the module 'driver/xf86-video-vga' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+ This package is built from the X.org xf86-video-vga driver module.
diff --git a/debian/rules b/debian/rules
index f1a458d..71e9228 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ binary-arch: build install serverabi
dh_testroot
dh_installdocs
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing
dh_link
dh_strip
commit 87c87c63b0cf80869491ee0e1fc3f76f82a11177
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 14:42:22 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-vga.
diff --git a/debian/changelog b/debian/changelog
index 5dc9107..ee896cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
xserver-xorg-video-vga (1:4.1.0-4) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Add link to xserver-xorg-core bug script, so that bugreports contain
the user's config and log files.
* Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
versions don't have the bug script.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Tue, 7 Nov 2006 07:30:46 +0100
+ [ Timo Aaltonen ]
+ * Replaces/Conflicts: xserver-xorg-driver-vga.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 14:42:05 +0300
xserver-xorg-video-vga (1:4.1.0-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1702a48..64d05e6 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Package: xserver-xorg-video-vga
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (>= 2:1.1.1-11)
Provides: xserver-xorg-video-1.0
-Replaces: xserver-xorg (<< 6.8.2-35)
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-vga
+Conflicts: xserver-xorg-driver-vga
Description: X.Org X server -- VGA display driver
This driver for the X.Org X server (see xserver-xorg for a further description)
uses the standard VGA interface provided on all video cards, but runs
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <branden@sisyphus.(none)>
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] && [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
>$@
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
commit c5665497bc393b83951a263926e0d9ee27f3d573
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 1 11:10:05 2007 -0800
Replace references to XFree86/XF86Config in man page
diff --git a/man/vga.man b/man/vga.man
index 5781c1b..692f220 100644
--- a/man/vga.man
+++ b/man/vga.man
@@ -14,7 +14,7 @@ vga \- Generic VGA video driver
.fi
.SH DESCRIPTION
.B vga
-is an XFree86 driver for generic VGA video cards. It can drive most
+is an __xservername__ driver for generic VGA video cards. It can drive most
VGA-compatible video cards, but only makes use of the basic standard
VGA core that is common to these cards. The driver supports depths 1, 4
and 8. All relevant visual types are supported at each depth.
@@ -28,7 +28,7 @@ The
driver supports most VGA-compatible video cards. There are some known
exceptions, and those should be listed here.
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.PP
@@ -60,6 +60,6 @@ This option is recommended for performance reasons when running at depths
when using those depths in a multi-head configuration where one or more
of the other screens is operating at a different depth.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Marc La France, David Dawes, and Dirk Hohndel.
Reply to: