diff options
| author | Eric Sandall | 2008-03-16 21:30:48 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-16 21:30:48 -0700 |
| commit | 3a6ab25d6514a412da4fe78e3be6fdbbd46d126d (patch) | |
| tree | cadf965cae2cc78d8172804d99e08563a4a56e4e /xorg-data | |
| parent | 0ebc7b631bd65f241b183996b2fce36176512287 (diff) | |
xorg-data-profile: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-data')
| -rwxr-xr-x | xorg-data/xorg-data-profile/CONFLICTS | 9 | ||||
| -rw-r--r-- | xorg-data/xorg-data-profile/HISTORY | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/xorg-data/xorg-data-profile/CONFLICTS b/xorg-data/xorg-data-profile/CONFLICTS index 202d4ad525..5d1493e9a0 100755 --- a/xorg-data/xorg-data-profile/CONFLICTS +++ b/xorg-data/xorg-data-profile/CONFLICTS @@ -1,5 +1,6 @@ -conflicts xfree86-devel && -conflicts xfree86-libs && -conflicts xfree86-4.3 && -conflicts xfree86 && +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/xorg-data-profile/HISTORY b/xorg-data/xorg-data-profile/HISTORY index 206987a1fa..ce34c86561 100644 --- a/xorg-data/xorg-data-profile/HISTORY +++ b/xorg-data/xorg-data-profile/HISTORY @@ -1,6 +1,7 @@ 2008-03-16 Eric Sandall <sandalle@sourcemage.org> * CONFLICTS: xfree86-lib -> xfree86-libs xfree86-43 -> xfree86-4.3 + Auto-conflicts with all prior monolithic X providers 2005-12-26 Robin Cook <rcook@wyrms.net> * DEPENDS: typo correction |