summaryrefslogtreecommitdiffstats
path: root/xorg-font/font-screen-cyrillic
diff options
context:
space:
mode:
authorEric Sandall2008-03-16 22:59:06 -0700
committerEric Sandall2008-03-16 22:59:06 -0700
commitff450ac5cef5fbb8c4507e1fb7ae79cad26c2a7f (patch)
treefe6abbb7440d0273e7dae2f437a2d30a752d2242 /xorg-font/font-screen-cyrillic
parent114c17bb4ecaced27b16dcc15ec61b6f6fbf3051 (diff)
font-screen-cyrillic: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-font/font-screen-cyrillic')
-rwxr-xr-xxorg-font/font-screen-cyrillic/CONFLICTS6
-rw-r--r--xorg-font/font-screen-cyrillic/HISTORY4
2 files changed, 10 insertions, 0 deletions
diff --git a/xorg-font/font-screen-cyrillic/CONFLICTS b/xorg-font/font-screen-cyrillic/CONFLICTS
new file mode 100755
index 0000000000..5d1493e9a0
--- /dev/null
+++ b/xorg-font/font-screen-cyrillic/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-screen-cyrillic/HISTORY b/xorg-font/font-screen-cyrillic/HISTORY
index 45dde3a57f..aa4a0d1501 100644
--- a/xorg-font/font-screen-cyrillic/HISTORY
+++ b/xorg-font/font-screen-cyrillic/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
@@ -29,3 +32,4 @@
2005-11-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DETAILS, HISTORY: created spell
+