diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-30 18:37:29 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-30 18:37:29 +0000 |
| commit | cb2f69533fd5771c386d1b994b2179e76c4ded54 (patch) | |
| tree | 98f4f9bff7afd6e9f0ce2c50b01d1e5ad55ec539 /debian | |
| parent | 6dbb05a4cba3cdc811308762058d722f11464683 (diff) | |
| parent | aa3d3aacdb991ad989933d71734e300535c7d350 (diff) | |
| download | xine-lib-cb2f69533fd5771c386d1b994b2179e76c4ded54.tar.gz xine-lib-cb2f69533fd5771c386d1b994b2179e76c4ded54.tar.bz2 | |
Merge from 1.1 (except po/*; translators needed for this).
--HG--
rename : src/video_out/vidix/drivers/mga_vid.c => contrib/vidix/drivers/mga_vid.c
rename : src/video_out/vidix/drivers/nvidia_vid.c => contrib/vidix/drivers/nvidia_vid.c
rename : src/video_out/vidix/drivers/savage_vid.c => contrib/vidix/drivers/savage_vid.c
rename : src/xine-engine/video_out.h => include/xine/video_out.h
rename : src/xine-utils/xmllexer.h => include/xine/xmllexer.h
rename : po/libxine1.pot => po/libxine2.pot
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/debian/control b/debian/control index c0e5b0f40..a0c994cde 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,9 @@ Priority: optional Maintainer: xine Developers <xine-devel@lists.sourceforge.net> Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, automake1.9, autoconf, libtool, + libavcodec-dev (>= 0.cvs20070307-3) | libavcodeccvs-dev, + libavformat-dev (>= 0.cvs20070307-3) | libavformatcvs-dev, + libpostproc-dev (>= 0.cvs20070307-3) | libpostproccvs-dev, libxcb-xinerama0-dev | libxv-dev (<< 1:1.0.3), libxcb-xv0-dev | libxv-dev (<< 1:1.0.3), libxcb-xvmc0-dev | libxv-dev (<< 1:1.0.3), libxcb-shm0-dev | libxv-dev (<< 1:1.0.3), libxcb-shape0-dev | libxv-dev (<< 1:1.0.3), @@ -65,9 +68,9 @@ Architecture: any Depends: ${shlibs:Depends} Recommends: ${shlibs:Recommends}, libxine2-doc | libxine-doc Suggests: ${shlibs:Suggests}, libartsc0 -Conflicts: libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x -Replaces: libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x -Provides: libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x +Conflicts: libxine2-all-plugins, libxine2-bin, libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x +Replaces: libxine2-all-plugins, libxine2-bin, libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x +Provides: libxine2-all-plugins, libxine2-bin, libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x Description: the xine video/media player library, binary files This is the xine media player library (libxine). . |