summaryrefslogtreecommitdiffstats
path: root/xorg-extras/libpthread-stubs
diff options
context:
space:
mode:
authorEric Sandall2008-03-16 22:58:38 -0700
committerEric Sandall2008-03-16 22:58:38 -0700
commit8bc68fab9378e0824f8b1741f27ed32d48d888b8 (patch)
treef7fa4ea850bc6f15cc3fb7394c26b7eef3689884 /xorg-extras/libpthread-stubs
parent887cab1f8055bab8fe097801c96b4c943aec8919 (diff)
libpthread-stubs: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-extras/libpthread-stubs')
-rwxr-xr-xxorg-extras/libpthread-stubs/CONFLICTS6
-rw-r--r--xorg-extras/libpthread-stubs/HISTORY4
2 files changed, 10 insertions, 0 deletions
diff --git a/xorg-extras/libpthread-stubs/CONFLICTS b/xorg-extras/libpthread-stubs/CONFLICTS
new file mode 100755
index 0000000000..5d1493e9a0
--- /dev/null
+++ b/xorg-extras/libpthread-stubs/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-extras/libpthread-stubs/HISTORY b/xorg-extras/libpthread-stubs/HISTORY
index d4a566e7be..402e46ec9e 100644
--- a/xorg-extras/libpthread-stubs/HISTORY
+++ b/xorg-extras/libpthread-stubs/HISTORY
@@ -1,5 +1,9 @@
+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)
2007-02-01 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DETAILS, DEPENDS, HISTORY: created spell
+