summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2012-01-18 19:54:34 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2012-01-18 19:54:34 +0000
commit3119dd2de36dbd8bb9af95ab1826c15f3099b597 (patch)
tree76b0324c6e93b86550e63ad02f1154580ce79526 /debian
parent7366cab446742882341e4a5304527e8b1a6965eb (diff)
parentcb6e4b4ffd49cdef83c6d025f175cf6a79705fc8 (diff)
downloadxine-lib-3119dd2de36dbd8bb9af95ab1826c15f3099b597.tar.gz
xine-lib-3119dd2de36dbd8bb9af95ab1826c15f3099b597.tar.bz2
Merge.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/control2
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 2fb49aeb4..c0506849f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,11 @@ xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low
-- 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.21~hg-0) unstable; urgency=low
* Hg snapshot (dev build). Changelog is irrelevant :-)
- -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 27 Jul 2010 17:55:16 +0100
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 17 Jan 2012 19:06:22 +0000
xine-lib (1.1.5~cvs-0) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e10583a56..13f1f48a7 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config,
libflac-dev, libsdl1.2-dev, libwavpack-dev,
libsmbclient-dev, libspeex-dev, libmng-dev,
libmad0-dev, libmpcdec-dev, libcdio-dev, libvcdinfo-dev,
- libdvdnav-dev, libdvdread-dev,
+ libdvdnav-dev, libdvdread-dev, libbluray-dev,
zlib1g-dev, w3m, xmlto, librsvg2-bin
Standards-Version: 3.7.2