diff options
author | Eric Sandall | 2008-03-16 23:00:20 -0700 |
---|---|---|
committer | Eric Sandall | 2008-03-16 23:00:20 -0700 |
commit | 0b26f2ae6ff9e4bd30def87bce74cd8640f3f114 (patch) | |
tree | fd3ff59de29fd8a4e5db2804f92a0d4c3a15872a /xorg-util | |
parent | 9e6f7b9779c8ed475a0f3a1983f2ba1600c5a494 (diff) |
util-macros: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-util')
-rwxr-xr-x | xorg-util/util-macros/CONFLICTS | 6 | ||||
-rw-r--r-- | xorg-util/util-macros/HISTORY | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/xorg-util/util-macros/CONFLICTS b/xorg-util/util-macros/CONFLICTS new file mode 100755 index 0000000000..5d1493e9a0 --- /dev/null +++ b/xorg-util/util-macros/CONFLICTS @@ -0,0 +1,6 @@ +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/util-macros/HISTORY b/xorg-util/util-macros/HISTORY index 28c1a5118c..8e93ebd6d9 100644 --- a/xorg-util/util-macros/HISTORY +++ b/xorg-util/util-macros/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) @@ -42,3 +45,4 @@ 2005-11-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> * DETAILS, HISTORY: created spell + |