summaryrefslogtreecommitdiffstats
path: root/xorg-doc
diff options
context:
space:
mode:
authorEric Sandall2008-03-16 22:57:33 -0700
committerEric Sandall2008-03-16 22:57:33 -0700
commit8014683c764f5f631afaee4611d47e4ab02a3c0b (patch)
tree1c6340bb3be7f2843118e511015013dc23a3478d /xorg-doc
parentcaa0bb72ba6af6f709185ed7e9b21c1f8e852f0d (diff)
xorg-sgml-doctools: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-doc')
-rwxr-xr-xxorg-doc/xorg-sgml-doctools/CONFLICTS6
-rw-r--r--xorg-doc/xorg-sgml-doctools/HISTORY4
2 files changed, 10 insertions, 0 deletions
diff --git a/xorg-doc/xorg-sgml-doctools/CONFLICTS b/xorg-doc/xorg-sgml-doctools/CONFLICTS
new file mode 100755
index 0000000000..5d1493e9a0
--- /dev/null
+++ b/xorg-doc/xorg-sgml-doctools/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-doc/xorg-sgml-doctools/HISTORY b/xorg-doc/xorg-sgml-doctools/HISTORY
index 684ac87187..21cca9f868 100644
--- a/xorg-doc/xorg-sgml-doctools/HISTORY
+++ b/xorg-doc/xorg-sgml-doctools/HISTORY
@@ -1,3 +1,6 @@
+2008-03-16 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Auto-conflicts with all prior monolithic X providers
+
2007-03-21 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DETAILS: update to 1.2
@@ -28,3 +31,4 @@
2005-11-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DETAILS, HISTORY: created spell
+