Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7576
Modified Files:
libavcodec54-1.2-shlibs.info libavcodec55-2.0-shlibs.info
Log Message:
fix installation of man files in ffmpeg 1.2 and ffmpeg 2.0
Index: libavcodec54-1.2-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/libavcodec54-1.2-shlibs.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libavcodec54-1.2-shlibs.info 10 Jul 2013 18:25:16 -0000 1.3
+++ libavcodec54-1.2-shlibs.info 12 Jul 2013 19:22:01 -0000 1.4
@@ -1,6 +1,6 @@
Package: libavcodec54-1.2-shlibs
Version: 1.2.1
-Revision: 2
+Revision: 3
BuildDepends: <<
bzip2,
fink (>= 0.28),
@@ -155,6 +155,10 @@
cd finkbuild && make -w install DESTDIR=%d V=1
install -d %i/etc
install -m 664 doc/ffserver.conf %i/etc
+ ### man.3 files are put into man1
+ ### This is fixed in ffmpeg-2.0
+ mkdir -p %i/share/man/man3
+ mv %i/share/man/man1/*.3 %i/share/man/man3
<<
###
SplitOff: <<
@@ -173,6 +177,8 @@
<<
Replaces: <<
ffmpeg (<< 0.4.6-1),
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libavcodec-dev,
libavcodec1-dev,
libavcodec52-dev,
@@ -187,6 +193,7 @@
lib/ffmpeg-1.2/include/libavcodec
lib/ffmpeg-1.2/lib/libavcodec.dylib
lib/ffmpeg-1.2/lib/pkgconfig/libavcodec.pc
+ share/man/man3/libavcodec.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio/video encoders and decoders dev files
@@ -255,6 +262,8 @@
Replaces: <<
ffmpeg (<< 0.4.20071217-6),
ffmpeg-dev (<< 0.4.20071217-6),
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libavdevice-dev,
libavdevice52-dev,
libavdevice53-dev,
@@ -268,6 +277,7 @@
lib/ffmpeg-1.2/include/libavdevice
lib/ffmpeg-1.2/lib/libavdevice.dylib
lib/ffmpeg-1.2/lib/pkgconfig/libavdevice.pc
+ share/man/man3/libavdevice.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio/video device dev files
@@ -330,6 +340,8 @@
libavfilter3-2.0-dev
<<
Replaces: <<
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libavfilter1-dev,
libavfilter2-dev,
libavfilter2-0.11-dev,
@@ -342,6 +354,7 @@
lib/ffmpeg-1.2/include/libavfilter
lib/ffmpeg-1.2/lib/libavfilter.dylib
lib/ffmpeg-1.2/lib/pkgconfig/libavfilter.pc
+ share/man/man3/libavfilter.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio/video filtering dev files
@@ -404,6 +417,8 @@
libavformat55-2.0-dev
<<
Replaces: <<
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libavformat-dev,
libavformat1-dev,
libavformat52-dev,
@@ -418,6 +433,7 @@
lib/ffmpeg-1.2/include/libavformat
lib/ffmpeg-1.2/lib/libavformat.dylib
lib/ffmpeg-1.2/lib/pkgconfig/libavformat.pc
+ share/man/man3/libavformat.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio/video parser and generator dev files
@@ -477,6 +493,8 @@
libavutil52-2.0-dev
<<
Replaces: <<
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libavutil-dev,
libavutil50-dev,
libavutil51-dev,
@@ -490,6 +508,7 @@
lib/ffmpeg-1.2/include/libavutil
lib/ffmpeg-1.2/lib/libavutil.dylib
lib/ffmpeg-1.2/lib/pkgconfig/libavutil.pc
+ share/man/man3/libavutil.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio/video utils dev files
@@ -623,6 +642,8 @@
libswscale2-2.0-dev
<<
Replaces: <<
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libswscale-dev,
libswscale0-dev,
libswscale2-dev,
@@ -636,6 +657,7 @@
lib/ffmpeg-1.2/include/libswscale
lib/ffmpeg-1.2/lib/libswscale.dylib
lib/ffmpeg-1.2/lib/pkgconfig/libswscale.pc
+ share/man/man3/libswscale.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio/video scaling dev files
@@ -694,6 +716,8 @@
libswresample0-2.0-dev
<<
Replaces: <<
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libswresample0-dev,
libswresample0-0.11-dev,
libswresample0-1.0-dev,
@@ -705,6 +729,7 @@
lib/ffmpeg-1.2/include/libswresample
lib/ffmpeg-1.2/lib/libswresample.dylib
lib/ffmpeg-1.2/lib/pkgconfig/libswresample.pc
+ share/man/man3/libswresample.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio resampling dev files
@@ -750,10 +775,15 @@
x11-shlibs,
xvidcore-shlibs
<<
+ Replaces: <<
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3)
+ <<
Files: <<
bin/ff{mpeg,play,probe}
- share/man/man1/ff{mpeg,play,probe}.1
lib/ffmpeg-1.2/share/ffmpeg
+ share/man/man1/ff{mpeg,play,probe}.1
+ share/man/man1/ffmpeg-*.1
<<
DocFiles: COPYING.GPLv3 COPYING.LGPLv3 CREDITS INSTALL README doc/*.txt
finkbuild/doc/*.html
Description: Tool to convert video file formats
@@ -802,7 +832,11 @@
xvidcore-shlibs
<<
Conflicts: ffmpeg (<< 0.4.6-1)
- Replaces: ffmpeg (<< 0.4.6-1)
+ Replaces: <<
+ ffmpeg (<< 0.4.6-1),
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3)
+ <<
ConfFiles: %p/etc/ffserver.conf
Files: <<
bin/ffserver
Index: libavcodec55-2.0-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/libavcodec55-2.0-shlibs.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libavcodec55-2.0-shlibs.info 10 Jul 2013 18:28:11 -0000 1.2
+++ libavcodec55-2.0-shlibs.info 12 Jul 2013 19:22:01 -0000 1.3
@@ -1,6 +1,6 @@
Package: libavcodec55-2.0-shlibs
Version: 2.0
-Revision: 1
+Revision: 3
BuildDepends: <<
bzip2,
fink (>= 0.28),
@@ -186,6 +186,8 @@
<<
Replaces: <<
ffmpeg (<< 0.4.6-1),
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libavcodec-dev,
libavcodec1-dev,
libavcodec52-dev,
@@ -200,6 +202,7 @@
lib/ffmpeg-2.0/include/libavcodec
lib/ffmpeg-2.0/lib/libavcodec.dylib
lib/ffmpeg-2.0/lib/pkgconfig/libavcodec.pc
+ share/man/man3/libavcodec.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio/video encoders and decoders dev files
@@ -272,6 +275,8 @@
Replaces: <<
ffmpeg (<< 0.4.20071217-6),
ffmpeg-dev (<< 0.4.20071217-6),
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libavdevice-dev,
libavdevice52-dev,
libavdevice53-dev,
@@ -285,6 +290,7 @@
lib/ffmpeg-2.0/include/libavdevice
lib/ffmpeg-2.0/lib/libavdevice.dylib
lib/ffmpeg-2.0/lib/pkgconfig/libavdevice.pc
+ share/man/man3/libavdevice.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio/video device dev files
@@ -351,6 +357,8 @@
libavfilter3-2.0-dev
<<
Replaces: <<
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libavfilter1-dev,
libavfilter2-dev,
libavfilter2-0.11-dev,
@@ -363,6 +371,7 @@
lib/ffmpeg-2.0/include/libavfilter
lib/ffmpeg-2.0/lib/libavfilter.dylib
lib/ffmpeg-2.0/lib/pkgconfig/libavfilter.pc
+ share/man/man3/libavfilter.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio/video filtering dev files
@@ -429,6 +438,8 @@
libavformat55-2.0-dev
<<
Replaces: <<
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libavformat-dev,
libavformat1-dev,
libavformat52-dev,
@@ -443,6 +454,7 @@
lib/ffmpeg-2.0/include/libavformat
lib/ffmpeg-2.0/lib/libavformat.dylib
lib/ffmpeg-2.0/lib/pkgconfig/libavformat.pc
+ share/man/man3/libavformat.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio/video parser and generator dev files
@@ -506,6 +518,8 @@
libavutil52-2.0-dev
<<
Replaces: <<
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libavutil-dev,
libavutil50-dev,
libavutil51-dev,
@@ -519,6 +533,7 @@
lib/ffmpeg-2.0/include/libavutil
lib/ffmpeg-2.0/lib/libavutil.dylib
lib/ffmpeg-2.0/lib/pkgconfig/libavutil.pc
+ share/man/man3/libavutil.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio/video utils dev files
@@ -660,6 +675,8 @@
libswscale2-2.0-dev
<<
Replaces: <<
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libswscale-dev,
libswscale0-dev,
libswscale2-dev,
@@ -673,6 +690,7 @@
lib/ffmpeg-2.0/include/libswscale
lib/ffmpeg-2.0/lib/libswscale.dylib
lib/ffmpeg-2.0/lib/pkgconfig/libswscale.pc
+ share/man/man3/libswscale.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio/video scaling dev files
@@ -735,6 +753,8 @@
libswresample0-2.0-dev
<<
Replaces: <<
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3),
libswresample0-dev,
libswresample0-0.11-dev,
libswresample0-1.0-dev,
@@ -746,6 +766,7 @@
lib/ffmpeg-2.0/include/libswresample
lib/ffmpeg-2.0/lib/libswresample.dylib
lib/ffmpeg-2.0/lib/pkgconfig/libswresample.pc
+ share/man/man3/libswresample.3
<<
DocFiles: COPYING.LGPLv3
Description: Audio resampling dev files
@@ -795,10 +816,15 @@
x11-shlibs,
xvidcore-shlibs
<<
+ Replaces: <<
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3)
+ <<
Files: <<
bin/ff{mpeg,play,probe}
- share/man/man1/ff{mpeg,play,probe}.1
lib/ffmpeg-2.0/share/ffmpeg
+ share/man/man1/ff{mpeg,play,probe}{,-all}.1
+ share/man/man1/ffmpeg-*.1
<<
DocFiles: COPYING.GPLv3 COPYING.LGPLv3 CREDITS INSTALL README doc/*.txt
finkbuild/doc/*.html
Description: Tool to convert video file formats
@@ -851,12 +877,16 @@
xvidcore-shlibs
<<
Conflicts: ffmpeg (<< 0.4.6-1)
- Replaces: ffmpeg (<< 0.4.6-1)
+ Replaces: <<
+ ffmpeg (<< 0.4.6-1),
+ libavcodec54-1.2-shlibs (<< 1.2.1-3),
+ libavcodec55-2.0-shlibs (<< 2.0-3)
+ <<
ConfFiles: %p/etc/ffserver.conf
Files: <<
bin/ffserver
etc/ffserver.conf
- share/man/man1/ffserver.1
+ share/man/man1/ffserver{,-all}.1
<<
DocFiles: COPYING.GPLv3 COPYING.LGPLv3 CREDITS INSTALL README doc/*.txt
Description: Multimedia streaming server for live broadcasts
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
