summaryrefslogtreecommitdiffstats
path: root/xorg-util
diff options
context:
space:
mode:
authorEric Sandall2008-03-16 23:00:18 -0700
committerEric Sandall2008-03-16 23:00:18 -0700
commit0a412cc902b9ac74505e3109acb72b61e0ed694f (patch)
tree460425912c331f51e7db017a78f8f865f8da8dbd /xorg-util
parent3510457f40b8ca22fa4bba9f60853fc8da6d38cf (diff)
imake: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-util')
-rwxr-xr-xxorg-util/imake/CONFLICTS6
-rw-r--r--xorg-util/imake/HISTORY4
2 files changed, 10 insertions, 0 deletions
diff --git a/xorg-util/imake/CONFLICTS b/xorg-util/imake/CONFLICTS
new file mode 100755
index 0000000000..5d1493e9a0
--- /dev/null
+++ b/xorg-util/imake/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/imake/HISTORY b/xorg-util/imake/HISTORY
index d7af584fef..955d2e544b 100644
--- a/xorg-util/imake/HISTORY
+++ b/xorg-util/imake/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)
@@ -27,3 +30,4 @@
2005-11-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DETAILS, HISTORY: created spell
+