Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics In directory vz-cvs-3.sog:/tmp/cvs-serv13445
Modified Files: ffmpeg.info libavcodec53-shlibs.info libavcodec54-0.11-shlibs.info Log Message: prepare Conflicts/Replaces fields for ffmpeg-1.0 Index: ffmpeg.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/ffmpeg.info,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ffmpeg.info 15 Aug 2012 10:48:38 -0000 1.13 +++ ffmpeg.info 28 Sep 2012 14:20:54 -0000 1.14 @@ -1,6 +1,6 @@ Package: ffmpeg Version: 0.7.13 -Revision: 2 +Revision: 3 ### BuildDepends: << bzip2, @@ -229,8 +229,24 @@ SplitOff2: << Package: libavcodec52-dev Depends: libavcodec52-shlibs (= %v-%r) - Conflicts: ffmpeg (<< 0.4.6-1), libavcodec-dev, libavcodec1-dev, libavcodec52-dev, libavcodec53-dev, libavcodec54-0.11-dev - Replaces: ffmpeg (<< 0.4.6-1), libavcodec-dev, libavcodec1-dev, libavcodec52-dev, libavcodec53-dev, libavcodec54-0.11-dev + Conflicts: << + ffmpeg (<< 0.4.6-1), + libavcodec-dev, + libavcodec1-dev, + libavcodec52-dev, + libavcodec53-dev, + libavcodec54-0.11-dev, + libavcodec54-1.0-dev + << + Replaces: << + ffmpeg (<< 0.4.6-1), + libavcodec-dev, + libavcodec1-dev, + libavcodec52-dev, + libavcodec53-dev, + libavcodec54-0.11-dev, + libavcodec54-1.0-dev + << BuildDependsOnly: true Files: << include/libavcodec @@ -277,8 +293,22 @@ SplitOff4: << Package: libavformat52-dev Depends: libavformat52-shlibs (= %v-%r) - Conflicts: libavformat-dev, libavformat1-dev, libavformat52-dev, libavformat53-dev, libavformat54-0.11-dev - Replaces: libavformat-dev, libavformat1-dev, libavformat52-dev, libavformat53-dev, libavformat54-0.11-dev + Conflicts: << + libavformat-dev, + libavformat1-dev, + libavformat52-dev, + libavformat53-dev, + libavformat54-0.11-dev, + libavformat54-1.0-dev + << + Replaces: << + libavformat-dev, + libavformat1-dev, + libavformat52-dev, + libavformat53-dev, + libavformat54-0.11-dev, + libavformat54-1.0-dev + << BuildDependsOnly: true Files: << include/libavformat @@ -323,8 +353,20 @@ SplitOff6: << Package: libavutil50-dev Depends: libavutil50-shlibs (= %v-%r) - Conflicts: libavutil-dev, libavutil50-dev, libavutil51-dev, libavutil51-0.11-dev - Replaces: libavutil-dev, libavutil50-dev, libavutil51-dev, libavutil51-0.11-dev + Conflicts: << + libavutil-dev, + libavutil50-dev, + libavutil51-dev, + libavutil51-0.11-dev, + libavutil51-1.0-dev + << + Replaces: << + libavutil-dev, + libavutil50-dev, + libavutil51-dev, + libavutil51-0.11-dev, + libavutil51-1.0-dev + << BuildDependsOnly: true Files: << include/libavutil @@ -370,8 +412,20 @@ SplitOff8: << Package: libpostproc51-dev Depends: libpostproc51-shlibs (>= %v-%r) - Conflicts: libpostproc-dev, libpostproc1, libpostproc51-dev, libpostproc52-0.11-dev - Replaces: libpostproc-dev, libpostproc1, libpostproc51-dev, libpostproc52-0.11-dev + Conflicts: << + libpostproc-dev, + libpostproc1, + libpostproc51-dev, + libpostproc52-0.11-dev, + libpostproc52-1.0-dev + << + Replaces: << + libpostproc-dev, + libpostproc1, + libpostproc51-dev, + libpostproc52-0.11-dev, + libpostproc52-1.0-dev + << BuildDependsOnly: true Files: << include/libpostproc @@ -417,8 +471,20 @@ SplitOff10: << Package: libswscale0-dev Depends: libswscale0-shlibs (= %v-%r) - Conflicts: libswscale-dev, libswscale0-dev, libswscale2-dev, libswscale2-0.11-dev - Replaces: libswscale-dev, libswscale0-dev, libswscale2-dev, libswscale2-0.11-dev + Conflicts: << + libswscale-dev, + libswscale0-dev, + libswsca e0-dev, le-dev, libswscale0-dev, libswscale2-dev, libswscale2-0.11-dev bavformat54-0.11-dev ec54-0.11-dev "QxÎ* ò×xÎ* Àñ±ÿ 0ò±ÿ óXxÎ* zyÎ* èdÎ* HÎ* 0ò±ÿ `·Î* @ç±ÿ æ±ÿ ëmxÎ* 6 è è! è! Àñ±ÿ 0ò±ÿ xÎ* @è±ÿ "QxÎ* nxÎ* Àñ±ÿ ðPxÎ* ÿñ±ÿ ÀÿøÎ* óXxÎ* ðøÎ* ØôøÎ* ¨ùøÎ* zyÎ* xÎ* @è±ÿ ç±ÿ ëmxÎ* à! à! Àñ±ÿ 0ò±ÿ ÈÍtÎ* é±ÿ "QxÎ* nxÎ* Àñ±ÿ ðPxÎ* ÿñ±ÿ ðñ±ÿ èñ±ÿ kÎ* p 0ò±ÿ óXxÎ* zyÎ* é±ÿ ðç±ÿ ëmxÎ* G H I J K M N O P Àñ±ÿ 0ò±ÿ H KÎ* Àê±ÿ "QxÎ* nxÎ* Àñ±ÿ 0ÿøÎ* óXxÎ* Î* ¹(Î* ðøÎ* ØôøÎ* ¨ùøÎ* zyÎ* H KÎ* Àê±ÿ é±ÿ ëmxÎ* 8 KÎ* Àê±ÿ 0é±ÿ ëmxÎ* ( KÎ* Àê±ÿ `é±ÿ ëmxÎ* KÎ* Àê±ÿ é±ÿ ëmxÎ* ¨þøÎ* óXxÎ* ¨ùøÎ* ä±ÿ )Î* æWxÎ* ØôøÎ* 0ê±ÿ y)Î* æWxÎ* ðøÎ* `ê±ÿ Z)Î* æWxÎ* Ø´(Î* Î* ¹(Î* ðøÎ* ØÎ* ØôøÎ* ¨ùøÎ* zyÎ* kÎ* ôÎ* 0ò±ÿ pK(Î* ì±ÿ àê±ÿ ëmxÎ* 5 6 7 8 : <