summaryrefslogtreecommitdiffstats
path: root/xorg-font/font-adobe-utopia-75dpi
diff options
context:
space:
mode:
authorEric Sandall2008-03-18 00:15:43 -0700
committerEric Sandall2008-03-18 00:15:43 -0700
commit8efbb8e67f9e5d64403606b90eab2b9b315959d3 (patch)
treedb8651347894beef70d756795fff6e4cfe7cc79f /xorg-font/font-adobe-utopia-75dpi
parentd4477830bdcb499c930f7db4d06cb84d1ed2d606 (diff)
font-adobe-utopia-75dpi: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-font/font-adobe-utopia-75dpi')
-rwxr-xr-xxorg-font/font-adobe-utopia-75dpi/CONFLICTS2
-rw-r--r--xorg-font/font-adobe-utopia-75dpi/HISTORY3
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-font/font-adobe-utopia-75dpi/CONFLICTS b/xorg-font/font-adobe-utopia-75dpi/CONFLICTS
index 5d1493e9a0..8007c92eb4 100755
--- a/xorg-font/font-adobe-utopia-75dpi/CONFLICTS
+++ b/xorg-font/font-adobe-utopia-75dpi/CONFLICTS
@@ -3,4 +3,4 @@ conflicts xfree86-devel y
conflicts xfree86-libs y
conflicts xfree86-4.3 y
conflicts xfree86 y
-conflicts xorg
+conflicts xorg y
diff --git a/xorg-font/font-adobe-utopia-75dpi/HISTORY b/xorg-font/font-adobe-utopia-75dpi/HISTORY
index 3a78ce8b35..2a7cb54cbf 100644
--- a/xorg-font/font-adobe-utopia-75dpi/HISTORY
+++ b/xorg-font/font-adobe-utopia-75dpi/HISTORY
@@ -1,3 +1,6 @@
+2008-03-17 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Auto-conflicts with xorg as well
+
2008-03-16 Eric Sandall <sandalle@sourcemage.org>
* CONFLICTS: Auto-conflicts with all prior monolithic X providers