diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-05 19:26:05 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-05 19:26:05 +0000 |
| commit | 054a7a1300887eaa7c799d50248b68b57c7376b1 (patch) | |
| tree | 150dd6dcbbbb9b5f6f2712aa93a4a493433791d1 /debian | |
| parent | 52f388580cc4bd1261003785206c64585565b5b8 (diff) | |
| parent | ebbd60ff7043826886cd7c35fde9e06bfe3b5093 (diff) | |
| download | xine-lib-054a7a1300887eaa7c799d50248b68b57c7376b1.tar.gz xine-lib-054a7a1300887eaa7c799d50248b68b57c7376b1.tar.bz2 | |
Merge from 1.1.
--HG--
branch : 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 |