diff options
| author | Eric Sandall | 2008-03-16 22:01:25 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-16 22:01:25 -0700 |
| commit | 6a414a663a48500565949361b5f954c1405d39ff (patch) | |
| tree | cdc3f1e118e81db79d7571ccb4b83ee9c7271ccf /xorg-util | |
| parent | 7fd707e87df1dfa250a63d1fc0eaa4215e49fbab (diff) | |
xorg-utils: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-util')
| -rwxr-xr-x | xorg-util/xorg-utils/CONFLICTS | 14 | ||||
| -rw-r--r-- | xorg-util/xorg-utils/HISTORY | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/xorg-util/xorg-utils/CONFLICTS b/xorg-util/xorg-utils/CONFLICTS index 8e732a6fd8..5d1493e9a0 100755 --- a/xorg-util/xorg-utils/CONFLICTS +++ b/xorg-util/xorg-utils/CONFLICTS @@ -1,8 +1,6 @@ -conflicts xfree86-devel && -conflicts xfree86-lib && -conflicts xfree86-43 && -conflicts xfree86 && -conflicts xdirectfb && -conflicts xorg - - +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-util/xorg-utils/HISTORY b/xorg-util/xorg-utils/HISTORY index 9852d1ba51..03e7349beb 100644 --- a/xorg-util/xorg-utils/HISTORY +++ b/xorg-util/xorg-utils/HISTORY @@ -1,6 +1,10 @@ +2008-03-16 Eric Sandall <sandalle@sourcemage.org> + * CONFLICTS: Auto-conflicts with all prior monolithic X providers + 2006-08-27 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> * DETAILS: update to 7.1 and fix the name 2006-05-26 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> * BUILD,CONFLICTS,DEPENDS,DETAILS: created from xorg-util-profile * HISTORY,INSTALL,PRE_BUILD,PRE_INSTALL: created from xorg-util-profile + |