9 files changed, 40 insertions, 28 deletions
diff --git a/debian/changelog b/debian/changelog
index 2a9e42e9b..640044a8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-xine-lib (1.1.7~hg-0) unstable; urgency=low
+xine-lib (1.2.0~hg-0) unstable; urgency=low
 
   * Hg snapshot.
+  * Adjust for libxine2.
 
- -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Thu, 07 Jun 2007 02:48:13 +0100
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Tue, 17 Apr 2007 16:50:37 +0100
+
+xine-lib (1.1.6~hg-0) unstable; urgency=low
+
+  * Hg snapshot.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk>  Mon, 16 Apr 2007 22:00:07 +0100
 
 xine-lib (1.1.5~cvs-0) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 48d0ada09..1f8e06eb4 100644
--- a/debian/control
+++ b/debian/control
@@ -13,20 +13,20 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config,
 	libogg-dev, libvorbis-dev, libtheora-dev,
 	libesd0-dev, libgnomevfs2-dev,
 	zlib1g-dev, libartsc0-dev,
-	liblircclient-dev, libjack0.100.0-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, gs, sgmltools-lite
+	w3m, gs, xmlto, librsvg2-bin
 Build-Conflicts: libdvdnav-dev, libvcdinfo-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), libxine2-dev
+Depends: libxine2 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev
+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).
@@ -42,11 +42,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).
  .
@@ -57,10 +58,10 @@ 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}, libxine1-doc | libxine-doc
+Recommends: ${shlibs:Recommends}, libxine2-doc | libxine-doc
 Suggests: ${shlibs:Suggests}, libartsc0
 Description: the xine video/media player library, binary files
  This is the xine media player library (libxine). 
@@ -76,10 +77,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/libxine-dev.install b/debian/libxine2-dev.install
index 6fadf7dc5..6fadf7dc5 100644
--- a/debian/libxine-dev.install
+++ b/debian/libxine2-dev.install
diff --git a/debian/libxine2-doc.docs b/debian/libxine2-doc.docs
new file mode 100644
index 000000000..3df629bbf
--- /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.syncfb*
+debian/tmp/usr/share/doc/libxine2/README.opengl*
+debian/tmp/usr/share/doc/libxine2/README.dxr3*
+debian/tmp/usr/share/doc/libxine2/README.dvb*
diff --git a/debian/libxine1-doc.manpages b/debian/libxine2-doc.manpages
index 23e59ea93..23e59ea93 100644
--- a/debian/libxine1-doc.manpages
+++ b/debian/libxine2-doc.manpages
diff --git a/debian/libxine1.install b/debian/libxine2.install
index b4037aa21..8c97ee196 100644
--- a/debian/libxine1.install
+++ b/debian/libxine2.install
@@ -3,6 +3,6 @@ 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
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 d6c917315..9837482dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,9 +58,13 @@ ifeq (,$(findstring optimize,$(DEB_BUILD_OPTIONS)))
  DEB_BUILD_CONFIG_OPTIONS += --build=$(DEB_BUILD_GNU_TYPE)
 endif
 
+# enable SyncFB video output plugin on Linux
+ifeq (linux,$(filter linux,$(subst -, ,$(DEB_BUILD_GNU_TYPE))))
+  DEB_BUILD_CONFIG_OPTIONS += --enable-syncfb
+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 \
@@ -129,10 +133,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}