diff options
author | Ladislav Hagara | 2010-11-03 01:59:45 +0100 |
---|---|---|
committer | George Sherwood | 2010-11-19 15:53:21 -0600 |
commit | bb388dff03529cec2269aa3a3c841b77e5cf6d48 (patch) | |
tree | 99dc8090fd98057de134cf3902a55d0b0c30e072 | |
parent | d82962669c5d2ca8144be7a5c18aedae0abd3ff5 (diff) |
jpeg provides JPEG and conflicts with libjpeg-turbo
(cherry picked from commit ca3dbbbffb71307b9edca60617550a6fc569e4d1)
-rwxr-xr-x | graphics-libs/jpeg/CONFLICTS | 1 | ||||
-rw-r--r-- | graphics-libs/jpeg/HISTORY | 3 | ||||
-rwxr-xr-x | graphics-libs/jpeg/PROVIDES | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/graphics-libs/jpeg/CONFLICTS b/graphics-libs/jpeg/CONFLICTS new file mode 100755 index 0000000000..640fd6ab8b --- /dev/null +++ b/graphics-libs/jpeg/CONFLICTS @@ -0,0 +1 @@ +conflicts libjpeg-turbo diff --git a/graphics-libs/jpeg/HISTORY b/graphics-libs/jpeg/HISTORY index 9b986858ea..3abcf7e631 100644 --- a/graphics-libs/jpeg/HISTORY +++ b/graphics-libs/jpeg/HISTORY @@ -1,3 +1,6 @@ +2010-11-03 Ladislav Hagara <hgr@vabo.cz> + * CONFLICTS, PROVIDES: added + 2010-05-24 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 8b diff --git a/graphics-libs/jpeg/PROVIDES b/graphics-libs/jpeg/PROVIDES new file mode 100755 index 0000000000..fec8ba9957 --- /dev/null +++ b/graphics-libs/jpeg/PROVIDES @@ -0,0 +1 @@ +JPEG |