summaryrefslogtreecommitdiffstats
path: root/xorg-util
diff options
context:
space:
mode:
authorEric Sandall2008-03-16 23:00:21 -0700
committerEric Sandall2008-03-16 23:00:21 -0700
commit0396fd5abd71746a1ece5b7176c478f68dce6612 (patch)
treea266a46b0422e4c3a21333eb933b655a8023d0f7 /xorg-util
parent0b26f2ae6ff9e4bd30def87bce74cd8640f3f114 (diff)
xorg-cf-files: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-util')
-rwxr-xr-xxorg-util/xorg-cf-files/CONFLICTS6
-rw-r--r--xorg-util/xorg-cf-files/HISTORY4
2 files changed, 10 insertions, 0 deletions
diff --git a/xorg-util/xorg-cf-files/CONFLICTS b/xorg-util/xorg-cf-files/CONFLICTS
new file mode 100755
index 0000000000..5d1493e9a0
--- /dev/null
+++ b/xorg-util/xorg-cf-files/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/xorg-cf-files/HISTORY b/xorg-util/xorg-cf-files/HISTORY
index 3724c2f481..7397984214 100644
--- a/xorg-util/xorg-cf-files/HISTORY
+++ b/xorg-util/xorg-cf-files/HISTORY
@@ -1,3 +1,6 @@
+2008-03-16 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Auto-conflicts with all prior monolithic X providers
+
2007-12-04 Thomas Orgis <sobukus@sourcemage.org>
* PRE_BUILD, lib64.patch: X11 libdir is _not_ /usr/lib64.
this config file issue made some apps (groff at least) install
@@ -36,3 +39,4 @@
2005-11-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DETAILS, HISTORY: created spell
+