diff options
| author | Eric Sandall | 2008-03-16 21:29:56 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-16 21:29:56 -0700 |
| commit | 0ebc7b631bd65f241b183996b2fce36176512287 (patch) | |
| tree | 12d9cfaa62f0f0ef87a0b23e910e14bfe37f8f46 /xorg-data/xkeyboard-config | |
| parent | 2c5eac5bbd5c07818c0a8bbdf051aa74d6aefc02 (diff) | |
xkeyboard-config: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-data/xkeyboard-config')
| -rwxr-xr-x | xorg-data/xkeyboard-config/CONFLICTS | 8 | ||||
| -rw-r--r-- | xorg-data/xkeyboard-config/HISTORY | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/xorg-data/xkeyboard-config/CONFLICTS b/xorg-data/xkeyboard-config/CONFLICTS index d076eadeff..362a2e9b6b 100755 --- a/xorg-data/xkeyboard-config/CONFLICTS +++ b/xorg-data/xkeyboard-config/CONFLICTS @@ -1 +1,7 @@ -conflicts xkbdata +conflicts xkbdata +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/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY index fbcce774d1..c5fa1cb0c7 100644 --- a/xorg-data/xkeyboard-config/HISTORY +++ b/xorg-data/xkeyboard-config/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) @@ -28,3 +31,4 @@ 2005-12-23 Robin Cook <rcook@wyrms.net> * created spell + |