1 files changed, 9 insertions, 9 deletions

diff --git a/debian/control b/debian/control
index d3a1b1bde..e654bd873 100644
--- a/debian/control
+++ b/debian/control
@@ -7,23 +7,23 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config,
 	libavcodec-dev (>= 0.cvs20070307-3) | libavcodeccvs-dev,
 	libavformat-dev (>= 0.cvs20070307-3) | libavformatcvs-dev,
 	libpostproc-dev (>= 0.cvs20070307-3) | libpostproccvs-dev,
-	libxcb-xinerama0-dev | libxv-dev (<< 1:1.0.3), libxcb-xv0-dev | libxv-dev (<< 1:1.0.3),
-	libxcb-xvmc0-dev | libxv-dev (<< 1:1.0.3), libxcb-shm0-dev | libxv-dev (<< 1:1.0.3),
+	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),
-	libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev, 
+	libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev,
 	libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 	libaa1-dev, libcaca-dev, libmodplug-dev,
-	libmagick9-dev, libpng12-dev, libfreetype6-dev, 
+	libjack-dev, libpulse-dev, libartsc0-dev,
+	libmagick9-dev | libmagick-dev |libmagickwand-dev,
+	libpng12-dev, libfreetype6-dev,
 	libogg-dev, libvorbis-dev, libtheora-dev,
 	libesd0-dev, libgnomevfs2-dev,
-	zlib1g-dev, libartsc0-dev,
-	liblircclient-dev, libjack0.100.0-dev | libjack-dev,
+	liblircclient-dev,
 	libdirectfb-dev (>= 0.9.22), libgtk2.0-dev,
-	libflac-dev, libpulse-dev, libsdl1.2-dev, libwavpack-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,
-	w3m, xmlto, librsvg2-bin
-Build-Conflicts: libdvdnav-dev
+	zlib1g-dev, w3m, xmlto, librsvg2-bin
 Standards-Version: 3.7.2
 
 Package: libxine-dev