summaryrefslogtreecommitdiffstats
path: root/xorg-font/font-bitstream-75dpi
diff options
context:
space:
mode:
authorEric Sandall2008-03-16 22:58:52 -0700
committerEric Sandall2008-03-16 22:58:52 -0700
commitf4c737e0a4faf54b6dd52c175d3f9db4f62b666c (patch)
tree7c3d6f06f3f217d43f66e121d63506b23254c185 /xorg-font/font-bitstream-75dpi
parent397b3ab77471ad90f578b13387140acecd954f43 (diff)
font-bitstream-75dpi: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-font/font-bitstream-75dpi')
-rwxr-xr-xxorg-font/font-bitstream-75dpi/CONFLICTS6
-rw-r--r--xorg-font/font-bitstream-75dpi/HISTORY4
2 files changed, 10 insertions, 0 deletions
diff --git a/xorg-font/font-bitstream-75dpi/CONFLICTS b/xorg-font/font-bitstream-75dpi/CONFLICTS
new file mode 100755
index 0000000000..5d1493e9a0
--- /dev/null
+++ b/xorg-font/font-bitstream-75dpi/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-bitstream-75dpi/HISTORY b/xorg-font/font-bitstream-75dpi/HISTORY
index 051ffe4fc4..130aba8ca3 100644
--- a/xorg-font/font-bitstream-75dpi/HISTORY
+++ b/xorg-font/font-bitstream-75dpi/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
+