diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-02 15:30:50 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-06-02 15:30:50 +0100 |
| commit | 8e910e3fea1078118f4343db9c519e10be73877c (patch) | |
| tree | 0a03fd067531bc952957521fa0357cd560f8c1b2 /debian/control | |
| parent | 43f1a8e3c042707c60661c625ce7b348c50eb510 (diff) | |
| parent | 29a4bed3de97bf33fe1dd786c0b1f0638c152684 (diff) | |
| download | xine-lib-8e910e3fea1078118f4343db9c519e10be73877c.tar.gz xine-lib-8e910e3fea1078118f4343db9c519e10be73877c.tar.bz2 | |
Merge from 1.1; handle Debian packaging fallout from the merge.
--HG--
rename : debian/libxine1-doc.docs => debian/libxine2-doc.docs
rename : debian/libxine1-doc.manpages => debian/libxine2-doc.manpages
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/debian/control b/debian/control index fc7bf047c..a8f4cccb3 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Package: libxine-dev Architecture: any Section: libdevel Depends: libxine2 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev -Conflicts: xine-ui (<< 0.9.10) +Conflicts: xine-ui (<< 0.9.10), libxine2-dev Description: the xine video player library, development packages This contains development files (headers, documentation and the like) for the xine library (libxine). @@ -42,10 +42,26 @@ Description: the xine video player library, development packages The xine-ui and gxine packages each provide one for your convenience, so you can just start watching your VCDs ;-) +Package: libxine2-doc +Architecture: all +Section: libdevel +Provides: libxine-doc +Conflicts: libxine1-doc +Replaces: libxine1-doc +Description: the xine video player library, development packages + This contains documentation for the xine library (libxine). + . + Libxine provides the complete infrastructure for a video/media player. It + supports MPEG 1/2 and some AVI and Quicktime videos out of the box, so you + can use it to play DVDs, (S)VCDs and most video files out there. It + supports network streams, subtitles and even MP3 or Ogg files. It's + extensible to your heart's content via plugins for audio and video output, + input media, demuxers (stream types), audio/video and subtitle codecs. + Package: libxine2 Architecture: any Depends: ${shlibs:Depends} -Recommends: ${shlibs:Recommends} +Recommends: ${shlibs:Recommends}, libxine2-doc | libxine-doc Suggests: ${shlibs:Suggests}, libartsc0 Description: the xine video/media player library, binary files This is the xine media player library (libxine). |