diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-08 23:41:35 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-08 23:41:35 +0000 |
| commit | 013fde587fae684931759737d450d6e0f45432ef (patch) | |
| tree | 4bdac13f22191f6dfd09f6fa91c705364d43dec5 /debian | |
| parent | 65723aa841ea45d2974e405899687f5f6901aa31 (diff) | |
| parent | a5be135136fe669714ad4ac9c22519f06a8b2a25 (diff) | |
| download | xine-lib-013fde587fae684931759737d450d6e0f45432ef.tar.gz xine-lib-013fde587fae684931759737d450d6e0f45432ef.tar.bz2 | |
Merge from 1.2.1-branch.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 044c9ef85..60e11e06c 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Standards-Version: 3.7.2 Package: libxine2-dev Architecture: any Section: libdevel -Depends: libxine2 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev, pkg-config +Depends: libxine2 (= ${Source-Version}), pkg-config Conflicts: xine-ui (<< 0.9.10), libxine-dev Replaces: libxine-dev (>= 1.1.90) Description: the xine video player library, development packages |