1 files changed, 21 insertions, 19 deletions
diff --git a/debian/control b/debian/control
index c4a127b4f..0a54b20b6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,34 +3,36 @@ 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,
-	automake1.9, autoconf, libtool,
+	automake1.9, autoconf, libtool, cvs,
 	libavcodec-dev (>= 0.cvs20070307-3) | libavcodeccvs-dev,
+	libavutil-dev (>= 0.cvs20070307-3) | libavutilcvs-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, 
-	libdirectfb-dev (>= 0.9.22),
+	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,
-	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,
-	libdirectfb-dev, libgtk2.0-dev,
-	libflac-dev, libpulse-dev, libsdl1.2-dev, libwavpack-dev,
-	libsmbclient-dev, libspeex-dev, libmng-dev, 
-	libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), 
-	w3m, transfig, sgmltools-lite
-Build-Conflicts: libdvdnav-dev, libvcdinfo-dev
+	liblircclient-dev,
+	libdirectfb-dev (>= 0.9.22), 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),
+	zlib1g-dev, w3m, transfig, sgmltools-lite,
+	ghostscript | gs-gpl | gs
 Standards-Version: 3.7.2
 
 Package: libxine-dev
 Architecture: any
 Section: libdevel
-Depends: libxine1 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev
+Depends: libxine1 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev, pkg-config
 Conflicts: xine-ui (<< 0.9.10), libxine2-dev
 Description: the xine video player library, development packages
  This contains development files (headers, documentation and the like)
@@ -65,13 +67,13 @@ Description: the xine video player library, development packages
 Package: libxine1
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: ${shlibs:Recommends}, libxine1-doc | libxine-doc
-Suggests: ${shlibs:Suggests}, libartsc0
+Recommends: ${shlibs:Recommends}
+Suggests: ${shlibs:Suggests}, libxine1-doc | libxine-doc
 Conflicts: libxine1-all-plugins, libxine1-bin, libxine1-console, libxine1-ffmpeg, libxine1-gnome, libxine1-misc-plugins, libxine1-plugins, libxine1-x
 Replaces: libxine1-all-plugins, libxine1-bin, libxine1-console, libxine1-ffmpeg, libxine1-gnome, libxine1-misc-plugins, libxine1-plugins, libxine1-x
 Provides: libxine1-all-plugins, libxine1-bin, libxine1-console, libxine1-ffmpeg, libxine1-gnome, libxine1-misc-plugins, libxine1-plugins, libxine1-x
 Description: the xine video/media player library, binary files
- This is the xine media player library (libxine). 
+ This is the xine media player library (libxine).
  .
  Libxine provides the complete infrastructure for a video/media player. It
  supports MPEG 1/2 and some AVI and Quicktime videos out of the box, so you
@@ -89,7 +91,7 @@ Priority: extra
 Architecture: any
 Depends: libxine1 (= ${Source-Version})
 Description: the xine video/media player library, debug data
- This is the xine media player library (libxine). 
+ This is the xine media player library (libxine).
  .
  Libxine provides the complete infrastructure for a video/media player. It
  supports MPEG 1/2 and some AVI and Quicktime videos out of the box, so you