summaryrefslogtreecommitdiffstats
path: root/xorg-font/font-cursor-misc
diff options
context:
space:
mode:
authorEric Sandall2008-03-16 22:58:55 -0700
committerEric Sandall2008-03-16 22:58:55 -0700
commit10f2dc42721343af3b1c7af0db263dab70118223 (patch)
tree9faf08fef9c94f98d99b3497ac4eb380ac539fbf /xorg-font/font-cursor-misc
parentf5aacb2ca80ba73a44eef2a3dd189cd27a139790 (diff)
font-cursor-misc: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-font/font-cursor-misc')
-rwxr-xr-xxorg-font/font-cursor-misc/CONFLICTS6
-rw-r--r--xorg-font/font-cursor-misc/HISTORY4
2 files changed, 10 insertions, 0 deletions
diff --git a/xorg-font/font-cursor-misc/CONFLICTS b/xorg-font/font-cursor-misc/CONFLICTS
new file mode 100755
index 0000000000..5d1493e9a0
--- /dev/null
+++ b/xorg-font/font-cursor-misc/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-font/font-cursor-misc/HISTORY b/xorg-font/font-cursor-misc/HISTORY
index 051ffe4fc4..130aba8ca3 100644
--- a/xorg-font/font-cursor-misc/HISTORY
+++ b/xorg-font/font-cursor-misc/HISTORY
@@ -1,3 +1,6 @@
+2008-03-16 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Auto-conflicts with all prior monolithic X providers
+
2007-08-04 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: update font description from SHORT (automated)
remove BUILD_API and UPDATED
@@ -26,3 +29,4 @@
2005-11-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DETAILS, HISTORY: created spell
+