9 files changed, 48 insertions, 55 deletions
diff --git a/debian/changelog b/debian/changelog
index 5d5bcc1aa..2fb49aeb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low
+
+  * Hg snapshot.
+  * Adjust for libxine2.
+
+ -- 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
 
   * Hg snapshot (dev build). Changelog is irrelevant :-)
diff --git a/debian/control b/debian/control
index de6b6a2b1..e10583a56 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,16 @@
-Source: xine-lib
+Source: xine-lib-1.2
 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.11 | automaken, autoconf, libtool, autopoint,
-	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-xv0-dev,	libxcb-shm0-dev, libxcb-shape0-dev,
+	automake | automaken, autoconf, libtool, autopoint,
+	libavcodec-dev (>= 0.cvs20080206) | libavcodeccvs-dev,
+	libavformat-dev (>= 0.cvs20080206) | libavformatcvs-dev,
+	libpostproc-dev (>= 0.cvs20080206) | libpostproccvs-dev,
+	libavutil-dev (>= 0.cvs20080206) | libavutilcvs-dev,
+	libxcb-xv0-dev, libxcb-shm0-dev, libxcb-shape0-dev,
 	libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev,
+	libvdpau-dev | nvidia-libvdpau-dev,
 	libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 	libcam-dev [kfreebsd-i386 kfreebsd-amd64],
 	libaa1-dev, libcaca-dev, libmodplug-dev,
@@ -22,17 +23,16 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config,
 	libdirectfb-dev, libgtk2.0-dev,
 	libflac-dev, libsdl1.2-dev, libwavpack-dev,
 	libsmbclient-dev, libspeex-dev, libmng-dev,
-	libmad0-dev, libmpcdec-dev, libcdio-dev,
+	libmad0-dev, libmpcdec-dev, libcdio-dev, libvcdinfo-dev,
 	libdvdnav-dev, libdvdread-dev,
-	zlib1g-dev, w3m, transfig, sgmltools-lite,
-	ghostscript | gs-gpl | gs
+	zlib1g-dev, w3m, xmlto, librsvg2-bin
 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, pkg-config
-Conflicts: xine-ui (<< 0.9.10), libxine2-dev
+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).
@@ -48,11 +48,12 @@ 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-doc
+Package: libxine2-doc
 Architecture: all
 Section: libdevel
 Provides: libxine-doc
-Conflicts: libxine2-doc
+Conflicts: libxine1-doc
+Replaces: libxine1-doc
 Description: the xine video player library, development packages
  This contains documentation for the xine library (libxine).
  .
@@ -63,14 +64,14 @@ Description: the xine video player library, development packages
  extensible to your heart's content via plugins for audio and video output,
  input media, demuxers (stream types), audio/video and subtitle codecs.
 
-Package: libxine1
+Package: libxine2
 Architecture: any
 Depends: ${shlibs:Depends}
 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
+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).
  .
@@ -85,10 +86,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-doc.docs b/debian/libxine1-doc.docs
deleted file mode 100644
index c75c374d7..000000000
--- a/debian/libxine1-doc.docs
+++ /dev/null
@@ -1,8 +0,0 @@
-debian/tmp/usr/share/doc/libxine1/faq/*
-debian/tmp/usr/share/doc/libxine1/README_xxmc.html
-debian/tmp/usr/share/doc/libxine1/README
-debian/tmp/usr/share/doc/libxine1/faq.*
-debian/tmp/usr/share/doc/libxine1/README.syncfb*
-debian/tmp/usr/share/doc/libxine1/README.opengl*
-debian/tmp/usr/share/doc/libxine1/README.dxr3*
-debian/tmp/usr/share/doc/libxine1/README.dvb*
diff --git a/debian/libxine1-doc.manpages b/debian/libxine1-doc.manpages
deleted file mode 100644
index 23e59ea93..000000000
--- a/debian/libxine1-doc.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man5/xine.5
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/libxine1.install b/debian/libxine2.install
index ab8a5901f..3f43fd950 100644
--- a/debian/libxine1.install
+++ b/debian/libxine2.install
@@ -4,7 +4,7 @@ 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/doc/libxine1/hackersguide/*
-usr/share/bug/libxine1/presubj
+usr/share/xine-lib
+usr/share/doc/libxine2/hackersguide/*
+usr/share/bug/libxine2/presubj
 usr/share/man/man1/xine-list*.1
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 8c90cbff1..5d34e792b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,16 +22,8 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 DEB_BUILD_CONFIG_OPTIONS :=
 
-CFLAGS += -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-	DEB_BUILD_CONFIG_OPTIONS += --disable-optimizations
-endif
-INSTALL_TARGET := install
-BUILD_TARGET := all
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_TARGET := install-debug
-	BUILD_TARGET := debug
+	DEB_BUILD_CONFIG_OPTIONS += --disable-optimizations --enable-debug
 endif
 
 ifneq (,$(findstring mips,$(DEB_HOST_GNU_TYPE)))
@@ -75,18 +67,11 @@ CONFIGURE_FLAGS := \
 	--build $(DEB_BUILD_GNU_TYPE) \
 	--host $(DEB_HOST_GNU_TYPE) \
 	--prefix=/usr \
-	--mandir=\$${prefix}/share/man \
-	--with-external-libmad \
-	--with-external-a52dec \
-	--with-external-libdts \
-	--with-external-ffmpeg \
-	--with-external-libmpcdec \
-	--with-external-dvdnav \
 	--with-freetype \
 	--with-wavpack \
 	--enable-ipv6 \
-	$(DEB_BUILD_CONFIG_OPTIONS) \
-	CFLAGS="$(CFLAGS)"
+	--with-external-dvdnav \
+	$(DEB_BUILD_CONFIG_OPTIONS)
 
 configure: configure-stamp
 configure-stamp:
@@ -151,10 +136,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.1.90)'
 	dh_installdeb
 	chmod +x debian/shlibdeps.sh
 	debian/shlibdeps.sh libxine${major}