diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 34 | ||||
| -rw-r--r-- | debian/dh_xine | 56 | ||||
| -rw-r--r-- | debian/dh_xine.1 | 21 | ||||
| -rw-r--r-- | debian/libxine1.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 32 | ||||
| -rw-r--r-- | debian/watch | 2 |
7 files changed, 125 insertions, 26 deletions
diff --git a/debian/changelog b/debian/changelog index 91999074d..7386ffb78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xine-lib (1.1.9~hg-0) unstable; urgency=low +xine-lib (1.1.17~hg-0) unstable; urgency=low [ Darren Salt ] * Hg snapshot. @@ -7,7 +7,7 @@ xine-lib (1.1.9~hg-0) unstable; urgency=low * remove gs from build-dependencies * change the maintainer field to xine-devel@lists.sourceforge.net. - -- Reinhard Tartler <siretart@tauware.de> Sun, 25 Nov 2007 23:45:52 +0100 + -- Darren Salt <linux@youmustbejoking.demon.co.uk> Mon, 12 Jan 2009 19:36:45 +0000 xine-lib (1.1.5~cvs-0) unstable; urgency=low diff --git a/debian/control b/debian/control index c4a127b4f..3bb868764 100644 --- a/debian/control +++ b/debian/control @@ -5,32 +5,34 @@ 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, + libavutil-dev (>= 0.cvs20070307-3) | libavutilcvs-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-xv0-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), + libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libcam-dev [kfreebsd-i386 kfreebsd-amd64], libaa1-dev, libcaca-dev, libmodplug-dev, - libmagick9-dev, libpng12-dev, libfreetype6-dev, + libjack-dev, libpulse-dev, libartsc0-dev, + libmagick9-dev | libmagick-dev |libmagickwand-dev, + libpng12-dev, libfreetype6-dev, libogg-dev, libvorbis-dev, libtheora-dev, libesd0-dev, libgnomevfs2-dev, - zlib1g-dev, libartsc0-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, sgmltools-lite -Build-Conflicts: libdvdnav-dev, libvcdinfo-dev + liblircclient-dev, + libdirectfb-dev (>= 0.9.22), libgtk2.0-dev, + libflac-dev, libsdl1.2-dev, libwavpack-dev, + libsmbclient-dev, libspeex-dev, libmng-dev, + libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), + zlib1g-dev, w3m, transfig, sgmltools-lite, + ghostscript | gs-gpl | gs 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 +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 Description: the xine video player library, development packages This contains development files (headers, documentation and the like) @@ -65,8 +67,8 @@ Description: the xine video player library, development packages Package: libxine1 Architecture: any Depends: ${shlibs:Depends} -Recommends: ${shlibs:Recommends}, libxine1-doc | libxine-doc -Suggests: ${shlibs:Suggests}, libartsc0 +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 diff --git a/debian/dh_xine b/debian/dh_xine new file mode 100644 index 000000000..e6129624e --- /dev/null +++ b/debian/dh_xine @@ -0,0 +1,56 @@ +#! /usr/bin/perl -w + +=head1 NAME + +dh_xine - calculates xine-lib dependencies + +=cut + +use strict; +use Debian::Debhelper::Dh_Lib; + +=head1 SYNOPSIS + +B<dh_xine> [S<I<debhelper options>>] + +=head1 DESCRIPTION + +dh_xine is a debhelper program that is responsible for generating the +${xine-x:Depends} and ${xine-console:Depends} substitutions and adding them +to substvars files. + +Each xine-lib front end is required to have one of these two substvars +listed in its Depends line in debian/control. Using package names directly +will, sooner or later, break. + +=head1 CONFORMS TO + +Debian policy, version 3.8.1 + +=cut + +init (); + +my $version; + +foreach my $package (@{$dh{DOPACKAGES}}) { + my $tmp = tmpdir ($package); + + delsubstvar($package, 'xine-x:Depends'); + addsubstvar ($package, 'xine-x:Depends', 'libxine1-x'); + + delsubstvar($package, 'xine-console:Depends'); + addsubstvar ($package, 'xine-console:Depends', 'libxine1-console'); +} + +=head1 SEE ALSO + +L<debhelper(7)> + +This program is not a part of debhelper. + +=head1 AUTHOR + +Darren Salt <linux@youmustbejoking.demon.co.uk> + +=cut diff --git a/debian/dh_xine.1 b/debian/dh_xine.1 new file mode 100644 index 000000000..5116d750a --- /dev/null +++ b/debian/dh_xine.1 @@ -0,0 +1,21 @@ +.TH DH_XINE 1 "2009-03-25" "The xine project" +.SH "NAME" +dh_xine - calculates xine\-lib dependencies +.SH "SYNOPSIS" +\fBdh_xine\fR [\fIdebhelper\ options\fR] +.SH "DESCRIPTION" +dh_xine is a debhelper program that is responsible for generating the +${xine\-x:Depends} and ${xine\-console:Depends} substitutions and adding them +to substvars files. +.PP +Each xine-lib front end is required to have one of these two substvars +listed in its Depends line in debian/control. Using package names directly +will, sooner or later, break. +.SH "CONFORMS TO" +Debian policy, version 3.8.1 +.SH "SEE ALSO" +\fIdebhelper\fR(7) +.PP +This program is not a part of debhelper. +.SH "AUTHOR" +Darren Salt <linux@youmustbejoking.demon.co.uk> diff --git a/debian/libxine1.install b/debian/libxine1.install index b4037aa21..ab8a5901f 100644 --- a/debian/libxine1.install +++ b/debian/libxine1.install @@ -1,3 +1,4 @@ +usr/bin/xine-list* usr/lib/libxine*.so.* usr/lib/xine/plugins/*/post/*.so usr/lib/xine/plugins/*/*.so @@ -6,3 +7,4 @@ usr/share/locale usr/share/xine usr/share/doc/libxine1/hackersguide/* usr/share/bug/libxine1/presubj +usr/share/man/man1/xine-list*.1 diff --git a/debian/rules b/debian/rules index 604954649..f570098b4 100755 --- a/debian/rules +++ b/debian/rules @@ -34,6 +34,18 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) BUILD_TARGET := debug endif +ifneq (,$(findstring mips,$(DEB_HOST_GNU_TYPE))) + DEB_BUILD_CONFIG_OPTIONS += PTHREAD_LIBS="-lpthread" +endif + +# taken from the qemu package +# Support multiple makes at once +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +else +NJOBS := 1 +endif + # note also "noauto" to inhibit running of autogen.sh # the "optimize" flag disables compatibility hacks @@ -59,7 +71,10 @@ ifeq (,$(findstring optimize,$(DEB_BUILD_OPTIONS))) endif # --mandir - remove after etch released (autoconf >= 2.59c gets it right) -CONFIGURE_FLAGS := --prefix=/usr \ +CONFIGURE_FLAGS := \ + --build $(DEB_BUILD_GNU_TYPE) \ + --host $(DEB_HOST_GNU_TYPE) \ + --prefix=/usr \ --mandir=\$${prefix}/share/man \ --with-external-libmad \ --with-external-a52dec \ @@ -67,6 +82,7 @@ CONFIGURE_FLAGS := --prefix=/usr \ --with-external-ffmpeg \ --with-freetype \ --with-wavpack \ + --enable-ipv6 \ $(DEB_BUILD_CONFIG_OPTIONS) \ CFLAGS="$(CFLAGS)" @@ -87,7 +103,7 @@ endif build: configure-stamp build-stamp build-stamp: dh_testdir - $(MAKE) + $(MAKE) -j $(NJOBS) touch build-stamp update-config-sub-guess: @@ -100,11 +116,11 @@ clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp po/*.gmo po/stamp-po - -$(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 -r rm - test -f .noauto || rm -rf compile config.guess configure depcomp install-sh ltmain.sh missing aclocal.m4 include/configure.h.in + if test -f .noauto; then \ + [ ! -f Makefile ] || $(MAKE) distclean; \ + else \ + [ ! -f Makefile ] || $(MAKE) maintainer-clean; \ + fi dh_clean install: build @@ -128,6 +144,8 @@ binary-arch: build install mv debian/tmp/usr/share/doc/xine-lib debian/tmp/usr/share/doc/libxine${major} # build libxine${major} package by moving files from libxine-dev dh_install --autodest --sourcedir=debian/tmp --list-missing + install -m755 debian/dh_xine debian/libxine-dev/usr/bin + dh_installman -plibxine-dev debian/dh_xine.1 dh_installdocs dh_installchangelogs -k ChangeLog dh_link diff --git a/debian/watch b/debian/watch index c82dbbc10..d3a4d7702 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=3 -http://xinehq.de/index.php/releases \ +http://www.xine-project.org/releases \ (?:.*/)?xine/xine-lib-([\d\.]*).tar.gz \ debian uupdate |