diff options
| author | Eric Sandall | 2008-03-16 21:29:11 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-16 21:29:11 -0700 |
| commit | 2c5eac5bbd5c07818c0a8bbdf051aa74d6aefc02 (patch) | |
| tree | 98cae4d86adca2b59c313ff7b110bca17291d226 /xorg-data | |
| parent | e7009158b70768f587471209b034833472811a80 (diff) | |
xkbdata: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-data')
| -rwxr-xr-x | xorg-data/xkbdata/CONFLICTS | 8 | ||||
| -rw-r--r-- | xorg-data/xkbdata/HISTORY | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/xorg-data/xkbdata/CONFLICTS b/xorg-data/xkbdata/CONFLICTS index 0de605c979..2308552fd0 100755 --- a/xorg-data/xkbdata/CONFLICTS +++ b/xorg-data/xkbdata/CONFLICTS @@ -1 +1,7 @@ -conflicts xkeyboard-config +conflicts xkeyboard-config +conflicts xdirectfb y +conflicts xfree86-devel y +conflicts xfree86-libs y +conflicts xfree86-4.3 y +conflicts xfree86 y +conflicts xorg diff --git a/xorg-data/xkbdata/HISTORY b/xorg-data/xkbdata/HISTORY index c9e1738a4c..6c8000831d 100644 --- a/xorg-data/xkbdata/HISTORY +++ b/xorg-data/xkbdata/HISTORY @@ -1,3 +1,6 @@ +2008-03-16 Eric Sandall <sandalle@sourcemage.org> + * CONFLICTS: Auto-conflicts with all prior monolithic X providers + 2007-08-03 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: update description & short (automated) @@ -31,3 +34,4 @@ 2005-11-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> * DETAILS, HISTORY: created spell + |