8 files changed, 87 insertions, 37 deletions
diff --git a/debian/changelog b/debian/changelog
index e3fcde9a3..2460b1267 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+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
+
+xine-lib (1.1.10~hg-0) unstable; urgency=low
+
+  [ Darren Salt ]
+  * Hg snapshot.
+
+  [ Reinhard Tartler ]
+  * remove gs from build-dependencies
+  * change the maintainer field to xine-devel@lists.sourceforge.net.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Mon, 14 Jan 2008 22:57:42 +0000
+
 xine-lib (1.1.5~cvs-0) unstable; urgency=low
 
   * CVS snapshot.
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). 
  .
diff --git a/debian/libxine1.install b/debian/libxine1.install
deleted file mode 100644
index 1efbabbea..000000000
--- a/debian/libxine1.install
+++ /dev/null
@@ -1,11 +0,0 @@
-usr/lib/libxine*.so.*
-usr/lib/xine/plugins/*/post/*.so
-usr/lib/xine/plugins/*/*.so
-usr/lib/xine/plugins/*/vidix/*.so
-usr/share/locale
-usr/share/xine
-usr/share/man/man5/xine.5
-usr/share/doc/libxine1/faq/*
-usr/share/doc/libxine1/README*
-usr/share/doc/libxine1/hackersguide/*
-usr/share/bug/libxine1/presubj
diff --git a/debian/libxine2-doc.docs b/debian/libxine2-doc.docs
new file mode 100644
index 000000000..799c2c091
--- /dev/null
+++ b/debian/libxine2-doc.docs
@@ -0,0 +1,8 @@
+debian/tmp/usr/share/doc/libxine2/faq/*
+debian/tmp/usr/share/doc/libxine2/README_xxmc.html
+debian/tmp/usr/share/doc/libxine2/README
+debian/tmp/usr/share/doc/libxine2/faq.*
+debian/tmp/usr/share/doc/libxine2/README.opengl*
+debian/tmp/usr/share/doc/libxine2/README.dxr3*
+debian/tmp/usr/share/doc/libxine2/README.dvb*
+NEWS
diff --git a/debian/libxine2-doc.install b/debian/libxine2-doc.install
new file mode 100644
index 000000000..d40f4d237
--- /dev/null
+++ b/debian/libxine2-doc.install
@@ -0,0 +1 @@
+usr/share/man/man5/xine.5
diff --git a/debian/libxine2.install b/debian/libxine2.install
new file mode 100644
index 000000000..8c97ee196
--- /dev/null
+++ b/debian/libxine2.install
@@ -0,0 +1,8 @@
+usr/lib/libxine*.so.*
+usr/lib/xine/plugins/*/post/*.so
+usr/lib/xine/plugins/*/*.so
+usr/lib/xine/plugins/*/vidix/*.so
+usr/share/locale
+usr/share/xine-lib
+usr/share/doc/libxine2/hackersguide/*
+usr/share/bug/libxine2/presubj
diff --git a/debian/reportbug.presubj b/debian/reportbug.presubj
index 229cd9d74..847ff0bad 100644
--- a/debian/reportbug.presubj
+++ b/debian/reportbug.presubj
@@ -21,9 +21,9 @@ with xine-ui, then file the bug against gxine)
 Report bugs for xine crashes
 ============================
 
-If you report a bug that applications linked against libxine1
+If you report a bug that applications linked against libxine2
 (xine-ui, gxine, amarok, totem, etc) segfault, please install the
-packages 'xine-ui' and 'libxine1-dbg', and try to reproduce it with
+packages 'xine-ui' and 'libxine2-dbg', and try to reproduce it with
 this command:
 
 > ulimit -c unlimited ; /usr/bin/xine --bug-report <mrl>
diff --git a/debian/rules b/debian/rules
index 8e4ca67fe..76b0a6c63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,11 +60,13 @@ endif
 
 # --mandir - remove after etch released (autoconf >= 2.59c gets it right)
 CONFIGURE_FLAGS := --prefix=/usr \
-	--mandir=\$${prefix}/share/man \
 	--with-external-libmad \
 	--with-external-a52dec \
 	--with-external-libdts \
-	--disable-cacatest \
+	--with-external-faad \
+	--with-external-ffmpeg=soft \
+	--with-freetype \
+	--with-wavpack \
 	$(DEB_BUILD_CONFIG_OPTIONS) \
 	CFLAGS="$(CFLAGS)"
 
@@ -101,8 +103,8 @@ clean:
 	-$(MAKE) distclean
 	# remove more cruft leftover by autohell
 	rm -f doc/faq/faq.html doc/faq/faq.txt doc/hackersguide/hackersguide.html m4/caca.m4
-	-test -f .noauto || find . -name Makefile.in -print | xargs rm
-	test -f .noauto || rm -rf compile config.guess configure depcomp install-sh ltmain.sh missing aclocal.m4 config.h.in
+	-test -f .noauto || find . -name Makefile.in -print | xargs -r rm
+	test -f .noauto || rm -rf compile config.guess configure depcomp install-sh ltmain.sh missing aclocal.m4 include/configure.h.in
 	dh_clean
 
 install: build
@@ -129,10 +131,10 @@ binary-arch: build install
 	dh_installdocs
 	dh_installchangelogs -k ChangeLog
 	dh_link
-	dh_strip --dbg-package=libxine1
+	dh_strip --dbg-package=libxine2
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -V 'libxine1 (>= 1.1.2-5)'
+	dh_makeshlibs -V 'libxine2 (>= 1.2.0~)'
 	dh_installdeb
 	chmod +x debian/shlibdeps.sh
 	debian/shlibdeps.sh libxine${major}