summaryrefslogtreecommitdiffstats
path: root/xorg-data/xorg-data-profile
diff options
context:
space:
mode:
authorEric Sandall2008-03-16 20:53:48 -0700
committerEric Sandall2008-03-16 20:53:48 -0700
commite7009158b70768f587471209b034833472811a80 (patch)
tree442e578d17402dcf636bdd00b66430544194be6a /xorg-data/xorg-data-profile
parentdf0c8ea07dc5bde50d18d3ba9c28495ae3a0c314 (diff)
xorg-data-profile: Proper names for xfree86-libs and xfree86-4.3
Diffstat (limited to 'xorg-data/xorg-data-profile')
-rwxr-xr-xxorg-data/xorg-data-profile/CONFLICTS12
-rw-r--r--xorg-data/xorg-data-profile/HISTORY4
2 files changed, 9 insertions, 7 deletions
diff --git a/xorg-data/xorg-data-profile/CONFLICTS b/xorg-data/xorg-data-profile/CONFLICTS
index 1f98811d84..202d4ad525 100755
--- a/xorg-data/xorg-data-profile/CONFLICTS
+++ b/xorg-data/xorg-data-profile/CONFLICTS
@@ -1,7 +1,5 @@
-conflicts xfree86-devel &&
-conflicts xfree86-lib &&
-conflicts xfree86-43 &&
-conflicts xfree86 &&
-conflicts xorg
-
-
+conflicts xfree86-devel &&
+conflicts xfree86-libs &&
+conflicts xfree86-4.3 &&
+conflicts xfree86 &&
+conflicts xorg
diff --git a/xorg-data/xorg-data-profile/HISTORY b/xorg-data/xorg-data-profile/HISTORY
index d5a1c6044a..206987a1fa 100644
--- a/xorg-data/xorg-data-profile/HISTORY
+++ b/xorg-data/xorg-data-profile/HISTORY
@@ -1,3 +1,7 @@
+2008-03-16 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: xfree86-lib -> xfree86-libs
+ xfree86-43 -> xfree86-4.3
+
2005-12-26 Robin Cook <rcook@wyrms.net>
* DEPENDS: typo correction