From 3118927915161d5f32b3bb5dcd6c2b721b9fcb99 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 2 Jun 2007 00:16:48 +0100 Subject: Add a -doc package, allowing libxine1 and libxine2 to be installed together. --- debian/control | 17 ++++++++++++++++- debian/libxine1-doc.docs | 8 ++++++++ debian/libxine1-doc.manpages | 1 + debian/libxine1.install | 3 --- 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 debian/libxine1-doc.docs create mode 100644 debian/libxine1-doc.manpages (limited to 'debian') diff --git a/debian/control b/debian/control index c01e82fa5..b3e499ba5 100644 --- a/debian/control +++ b/debian/control @@ -42,10 +42,25 @@ 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 +Architecture: all +Section: libdevel +Provides: libxine-doc +Conflicts: libxine2-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: libxine1 Architecture: any Depends: ${shlibs:Depends} -Recommends: ${shlibs:Recommends} +Recommends: ${shlibs:Recommends}, libxine1-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/libxine1-doc.docs b/debian/libxine1-doc.docs new file mode 100644 index 000000000..c75c374d7 --- /dev/null +++ b/debian/libxine1-doc.docs @@ -0,0 +1,8 @@ +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 new file mode 100644 index 000000000..23e59ea93 --- /dev/null +++ b/debian/libxine1-doc.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man5/xine.5 diff --git a/debian/libxine1.install b/debian/libxine1.install index 1efbabbea..b4037aa21 100644 --- a/debian/libxine1.install +++ b/debian/libxine1.install @@ -4,8 +4,5 @@ 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 -- cgit v1.2.3 From 29a4bed3de97bf33fe1dd786c0b1f0638c152684 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 2 Jun 2007 15:25:50 +0100 Subject: Conflict with libxine2-dev. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index b3e499ba5..fc8098175 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ 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) +Conflicts: xine-ui (<< 0.9.10), libxine2-dev Description: the xine video player library, development packages This contains development files (headers, documentation and the like) for the xine library (libxine). -- cgit v1.2.3 From a283e883dea4187165d4cd6f4f2e02989796feba Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 2 Jun 2007 15:38:09 +0100 Subject: Rename libxine-dev to libxine2-dev. --HG-- rename : debian/libxine-dev.install => debian/libxine2-dev.install --- debian/control | 4 ++-- debian/libxine-dev.install | 10 ---------- debian/libxine2-dev.install | 10 ++++++++++ 3 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 debian/libxine-dev.install create mode 100644 debian/libxine2-dev.install (limited to 'debian') diff --git a/debian/control b/debian/control index a8f4cccb3..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), libxine2-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). diff --git a/debian/libxine-dev.install b/debian/libxine-dev.install deleted file mode 100644 index 6fadf7dc5..000000000 --- a/debian/libxine-dev.install +++ /dev/null @@ -1,10 +0,0 @@ -usr/bin/xine-config -usr/include -usr/lib/libxine.la -usr/lib/libxine*.so -usr/lib/pkgconfig/libxine.pc -usr/lib/xine/plugins/*/*.la -usr/lib/xine/plugins/*/post/*.la -usr/lib/xine/plugins/*/vidix/*.la -usr/share/aclocal/xine.m4 -usr/share/man/man1/xine-config.1 diff --git a/debian/libxine2-dev.install b/debian/libxine2-dev.install new file mode 100644 index 000000000..6fadf7dc5 --- /dev/null +++ b/debian/libxine2-dev.install @@ -0,0 +1,10 @@ +usr/bin/xine-config +usr/include +usr/lib/libxine.la +usr/lib/libxine*.so +usr/lib/pkgconfig/libxine.pc +usr/lib/xine/plugins/*/*.la +usr/lib/xine/plugins/*/post/*.la +usr/lib/xine/plugins/*/vidix/*.la +usr/share/aclocal/xine.m4 +usr/share/man/man1/xine-config.1 -- cgit v1.2.3 From f587fe0e84650b5731f9fd81b1acf0f62e670e84 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 5 Jun 2007 19:45:56 +0100 Subject: Silence an ignored error when running "debuild clean". --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 395b983e0..e89896255 100755 --- a/debian/rules +++ b/debian/rules @@ -100,7 +100,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 -- cgit v1.2.3 From 063bcadd4c7f3802489f103eb753d375eb8c51df Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 7 Jun 2007 03:26:06 +0100 Subject: 1.1.7. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 178f0341a..2a9e42e9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xine-lib (1.1.6~hg-0) unstable; urgency=low +xine-lib (1.1.7~hg-0) unstable; urgency=low * Hg snapshot. - -- Darren Salt Mon, 16 Apr 2007 22:00:07 +0100 + -- Darren Salt Thu, 07 Jun 2007 02:48:13 +0100 xine-lib (1.1.5~cvs-0) unstable; urgency=low -- cgit v1.2.3