diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-03 16:56:44 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-03 16:56:44 +0100 |
| commit | b70e34352e304cf03da32b688d84eec3c3ffacec (patch) | |
| tree | 711ec8d7abc0dd6075d09085634e5a5432e40ee3 /debian | |
| parent | 08ad733e0103834bc61831ddce5a75c3f62e0173 (diff) | |
| parent | 2b0e330c2642081066316ca5ec9965912cd248de (diff) | |
| download | xine-lib-b70e34352e304cf03da32b688d84eec3c3ffacec.tar.gz xine-lib-b70e34352e304cf03da32b688d84eec3c3ffacec.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 41e87bed1..8e4eb98a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 17 Apr 2007 16:50:37 +0100 -xine-lib (1.1.13~hg-0) unstable; urgency=low +xine-lib (1.1.14~hg-0) unstable; urgency=low [ Darren Salt ] * Hg snapshot. @@ -14,7 +14,7 @@ xine-lib (1.1.13~hg-0) unstable; urgency=low * remove gs from build-dependencies * change the maintainer field to xine-devel@lists.sourceforge.net. - -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 08 Apr 2008 15:29:17 +0100 + -- Darren Salt <linux@youmustbejoking.demon.co.uk> Thu, 26 Jun 2008 20:32:42 +0100 xine-lib (1.1.5~cvs-0) unstable; urgency=low diff --git a/debian/control b/debian/control index adefe91a3..08fd23f3d 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, libxcb-shape0-dev | libxv-dev (<< 1:1.0.3), libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libcam-dev [kfreebsd-i386 kfreebsd-amd64], libaa1-dev, libcaca-dev, libmodplug-dev, libjack-dev, libpulse-dev, libartsc0-dev, libmagick9-dev | libmagick-dev |libmagickwand-dev, |