1 files changed, 42 insertions, 18 deletions

diff --git a/debian/control b/debian/control
index 6a72f689d..d3a1b1bde 100644
--- a/debian/control
+++ b/debian/control
@@ -1,31 +1,36 @@
-Source: xine-lib
+Source: xine-lib-1.2
 Section: libs
 Priority: optional
-Maintainer: Siggi Langauf <siggi@debian.org>
-Uploaders: Philipp Matthias Hahn <pmhahn@debian.org>, Reinhard Tartler <siretart@tauware.de>
-Build-Depends: debhelper (>= 4.0.4), binutils (>= 2.12.90.0.9), pkg-config,
+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,
+	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-shape0-dev | libxv-dev (<< 1:1.0.3),
 	libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev, 
-	libdirectfb-dev (>= 0.9.22),
 	libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-	libaa1-dev, libcaca-dev (>= 0.99.beta4-1), libmodplug-dev,
+	libaa1-dev, libcaca-dev, libmodplug-dev,
 	libmagick9-dev, libpng12-dev, libfreetype6-dev, 
 	libogg-dev, libvorbis-dev, libtheora-dev,
 	libesd0-dev, libgnomevfs2-dev,
-	zlib1g-dev, libartsc0-dev (>>1.1.0),
-	liblircclient-dev,
-	libflac-dev (>>1.1.0), libpulse-dev, libsdl1.2-dev (>=1.2.11),
+	zlib1g-dev, libartsc0-dev,
+	liblircclient-dev, libjack0.100.0-dev | libjack-dev,
+	libdirectfb-dev (>= 0.9.22), libgtk2.0-dev,
+	libflac-dev, libpulse-dev, libsdl1.2-dev, libwavpack-dev,
 	libsmbclient-dev, libspeex-dev, libmng-dev, 
-	libmad0-dev,  libcdio-dev (>= 0.76-1), 
-	w3m, transfig, gs, sgmltools-lite
-Build-Conflicts: libdvdnav-dev, libvcdinfo-dev
+	libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), libvcdinfo-dev,
+	w3m, xmlto, librsvg2-bin
+Build-Conflicts: libdvdnav-dev
 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
-Conflicts: xine-ui (<< 0.9.10)
+Depends: libxine2 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev, pkg-config
+Conflicts: xine-ui (<< 0.9.10), libxine-dev
 Description: the xine video player library, development packages
  This contains development files (headers, documentation and the like)
  for the xine library (libxine).
@@ -41,11 +46,30 @@ Description: the xine video player library, development packages
  The xine-ui and gxine packages each provide one for your convenience, so
  you can just start watching your VCDs ;-)
 
-Package: libxine1
+Package: libxine2-doc
+Architecture: all
+Section: libdevel
+Provides: libxine-doc
+Conflicts: libxine1-doc
+Replaces: libxine1-doc
+Description: the xine video player library, development packages
+ This contains documentation for the xine 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
+ can use it to play DVDs, (S)VCDs and most video files out there. It
+ supports network streams, subtitles and even MP3 or Ogg files. It's
+ extensible to your heart's content via plugins for audio and video output,
+ input media, demuxers (stream types), audio/video and subtitle codecs.
+
+Package: libxine2
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
-Suggests: ${shlibs:Suggests}, libartsc0
+Suggests: ${shlibs:Suggests}, libxine2-doc | libxine-doc
+Conflicts: libxine2-all-plugins, libxine2-bin, libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x
+Replaces: libxine2-all-plugins, libxine2-bin, libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x
+Provides: libxine2-all-plugins, libxine2-bin, libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x
 Description: the xine video/media player library, binary files
  This is the xine media player library (libxine). 
  .
@@ -60,10 +84,10 @@ Description: the xine video/media player library, binary files
  The xine-ui and gxine packages each provide one for your convenience, so
  you can just start watching your VCDs ;-)
 
-Package: libxine1-dbg
+Package: libxine2-dbg
 Priority: extra
 Architecture: any
-Depends: libxine1 (= ${Source-Version})
+Depends: libxine2 (= ${Source-Version})
 Description: the xine video/media player library, debug data
  This is the xine media player library (libxine). 
  .