diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-07-29 20:35:28 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-07-29 20:35:28 +0100 |
| commit | 9a6e4bd01cdde4ef55afdda47c4d8b34f42e767b (patch) | |
| tree | 8ecff5b5aa6da25c8c4feb97c8b3f4dfb04ae76c /debian | |
| parent | 51ee5df118326a3d2374f2432fff63dd3edceaf6 (diff) | |
| parent | c41975a7b4ca8e473979bfa13229f6077b951697 (diff) | |
| download | xine-lib-9a6e4bd01cdde4ef55afdda47c4d8b34f42e767b.tar.gz xine-lib-9a6e4bd01cdde4ef55afdda47c4d8b34f42e767b.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index c08d6194b..2fb49aeb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,13 +3,13 @@ xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low * Hg snapshot. * Adjust for libxine2. - -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 17 Apr 2007 16:50:37 +0100 + -- Darren Salt <linux@youmustbejoking.demon.co.uk> Thu, 29 Jul 2010 18:57:56 +0100 -xine-lib (1.1.19~hg-0) unstable; urgency=low +xine-lib (1.1.19+hg-0) unstable; urgency=low * Hg snapshot (dev build). Changelog is irrelevant :-) - -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 23 Feb 2010 22:49:45 +0000 + -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 27 Jul 2010 17:55:16 +0100 xine-lib (1.1.5~cvs-0) unstable; urgency=low diff --git a/debian/control b/debian/control index c9c57183c..7a7b0869c 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, libcam-dev [kfreebsd-i386 kfreebsd-amd64], libaa1-dev, libcaca-dev, libmodplug-dev, libjack-dev, libpulse-dev, libartsc0-dev, - libmagick9-dev | libmagick-dev |libmagickwand-dev, + graphicsmagick-libmagick-dev-compat | libmagick9-dev | libmagick-dev | libmagickwand-dev, libpng12-dev, libfreetype6-dev, libogg-dev, libvorbis-dev, libtheora-dev, libesd0-dev, libgnomevfs2-dev, |