diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-10 19:54:19 +0100 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-10 19:54:19 +0100 |
commit | 466ae2a2c156bb586120cfbba369f2b0c4df3c87 (patch) | |
tree | 814a3f2eca173bdfa754da4a25a85ce841d85fe5 | |
parent | 5de3db2e94524ec86dd7c7403fe9ceb19c03232d (diff) | |
parent | f6bf2891e65eac4d0ee465cff1c74e4e7ecde0f0 (diff) | |
download | xine-lib-466ae2a2c156bb586120cfbba369f2b0c4df3c87.tar.gz xine-lib-466ae2a2c156bb586120cfbba369f2b0c4df3c87.tar.bz2 |
Merge from 1.1.
-rw-r--r-- | debian/control | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/debian/control b/debian/control index 34f3676c5..eb353ef2c 100644 --- a/debian/control +++ b/debian/control @@ -3,15 +3,12 @@ Section: libs Priority: optional Maintainer: xine Developers <xine-devel@lists.sourceforge.net> Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, - automake | automaken, autoconf, libtool, - autopoint | gettext (<< 0.17-10), autopoint (>= 0.17-10) | cvs, + automake | automaken, autoconf, libtool, autopoint, libavcodec-dev (>= 0.cvs20080206) | libavcodeccvs-dev, libavformat-dev (>= 0.cvs20080206) | libavformatcvs-dev, libpostproc-dev (>= 0.cvs20080206) | libpostproccvs-dev, libavutil-dev (>= 0.cvs20080206) | libavutilcvs-dev, - libxcb-xv0-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), + libxcb-xv0-dev, libxcb-shm0-dev, libxcb-shape0-dev, libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev, libvdpau-dev | nvidia-libvdpau-dev | libxv-dev (<< 1:1.0.3), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], @@ -23,10 +20,10 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, libogg-dev, libvorbis-dev, libtheora-dev, libesd0-dev, libgnomevfs2-dev, liblircclient-dev, - libdirectfb-dev (>= 0.9.22), libgtk2.0-dev, + libdirectfb-dev, libgtk2.0-dev, libflac-dev, libsdl1.2-dev, libwavpack-dev, libsmbclient-dev, libspeex-dev, libmng-dev, - libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), libvcdinfo-dev, + libmad0-dev, libmpcdec-dev, libcdio-dev, libvcdinfo-dev, libdvdnav-dev, libdvdread-dev, zlib1g-dev, w3m, xmlto, librsvg2-bin Standards-Version: 3.7.2 |