diff options
author | Eric Sandall | 2008-03-16 22:58:54 -0700 |
---|---|---|
committer | Eric Sandall | 2008-03-16 22:58:54 -0700 |
commit | 617ec1a34de40f110707038ff7428dbad7e33feb (patch) | |
tree | 9a0d94e7f3ae9787caef3c83d354c4fff646a254 /xorg-font/font-bitstream-type1 | |
parent | 0b6da8dde3002789dd2291c663292a228dab63bd (diff) |
font-bitstream-type1: Auto-conflicts with all prior monolithic X providers
Diffstat (limited to 'xorg-font/font-bitstream-type1')
-rwxr-xr-x | xorg-font/font-bitstream-type1/CONFLICTS | 6 | ||||
-rw-r--r-- | xorg-font/font-bitstream-type1/HISTORY | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/xorg-font/font-bitstream-type1/CONFLICTS b/xorg-font/font-bitstream-type1/CONFLICTS new file mode 100755 index 0000000000..5d1493e9a0 --- /dev/null +++ b/xorg-font/font-bitstream-type1/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-type1/HISTORY b/xorg-font/font-bitstream-type1/HISTORY index 87e053243a..4af0ba89f3 100644 --- a/xorg-font/font-bitstream-type1/HISTORY +++ b/xorg-font/font-bitstream-type1/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 + |