summaryrefslogtreecommitdiffstats
path: root/xorg-util
diff options
context:
space:
mode:
authorEric Sandall2008-03-16 23:00:17 -0700
committerEric Sandall2008-03-16 23:00:17 -0700
commit3510457f40b8ca22fa4bba9f60853fc8da6d38cf (patch)
tree90e6252f86b7a7ea086a1cb84253269187190194 /xorg-util
parent8b8dd65966f73617e2d9cfc72fef3f2d87d3c2e5 (diff)
gccmakedep: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-util')
-rwxr-xr-xxorg-util/gccmakedep/CONFLICTS6
-rw-r--r--xorg-util/gccmakedep/HISTORY4
2 files changed, 10 insertions, 0 deletions
diff --git a/xorg-util/gccmakedep/CONFLICTS b/xorg-util/gccmakedep/CONFLICTS
new file mode 100755
index 0000000000..5d1493e9a0
--- /dev/null
+++ b/xorg-util/gccmakedep/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/gccmakedep/HISTORY b/xorg-util/gccmakedep/HISTORY
index 45b5f47ba0..478e3eace9 100644
--- a/xorg-util/gccmakedep/HISTORY
+++ b/xorg-util/gccmakedep/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)
@@ -22,3 +25,4 @@
2005-12-15 Robin Cook <rcook@wyrms.net>
* DETAILS, DEPENDS, HISTORY: created spell
+