Merge with 1.2 branch.

6 files changed, 29 insertions, 7 deletions

diff --git a/debian/control b/debian/control
index fc7bf047c..a831ad8c7 100644
--- a/debian/control
+++ b/debian/control
@@ -22,11 +22,11 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config,
 Build-Conflicts: libdvdnav-dev, libvcdinfo-dev
 Standards-Version: 3.7.2
 
-Package: libxine-dev
+Package: libxine2-dev
 Architecture: any
 Section: libdevel
 Depends: libxine2 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev
-Conflicts: xine-ui (<< 0.9.10)
+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,10 +42,26 @@ 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: 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}
+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). 
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/libxine2-doc.manpages b/debian/libxine2-doc.manpages
new file mode 100644
index 000000000..23e59ea93
--- /dev/null
+++ b/debian/libxine2-doc.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man5/xine.5
diff --git a/debian/libxine2.install b/debian/libxine2.install
index 42f7937c2..8c97ee196 100644
--- a/debian/libxine2.install
+++ b/debian/libxine2.install
@@ -4,8 +4,5 @@ usr/lib/xine/plugins/*/*.so
 usr/lib/xine/plugins/*/vidix/*.so
 usr/share/locale
 usr/share/xine-lib
-usr/share/man/man5/xine.5
-usr/share/doc/libxine2/faq/*
-usr/share/doc/libxine2/README*
 usr/share/doc/libxine2/hackersguide/*
 usr/share/bug/libxine2/presubj
diff --git a/debian/rules b/debian/rules
index 5082cc75a..c3ae26899 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,7 +103,7 @@ 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 || 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 config.h.in
 	dh_clean