diff options
| -rw-r--r-- | AUTHORS | 6 | ||||
| -rw-r--r-- | debian/dh_xine | 56 | ||||
| -rw-r--r-- | debian/dh_xine.1 | 21 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | src/demuxers/demux_mod.c | 15 | ||||
| -rw-r--r-- | src/dxr3/video_out_dxr3.c | 2 |
6 files changed, 97 insertions, 5 deletions
@@ -235,7 +235,7 @@ Marcelo Roberto Jimenez <mroberto@cetuc.puc-rio.br> George Staikos <staikos@0wned.org> xinerama bugfixes -Juan Manuel Garc? Molina <juanmagm@mail.com> +Juan Manuel García Molina <juanmagm@mail.com> spanish internationalization files. Jeffrey W. Baker <jwbaker@acm.org> @@ -293,7 +293,7 @@ Andrew Patrikalakis <anrp@irulethe.net> powerpc assembly memcpy() implementaions with assistance from Rogerio Brito <rbrito@iname.com> Benjamin Herrenschmidt <benh@kernel.crashing.org> - Michel Dzer <daenzer@debian.org> + Michel Dänzer <daenzer@debian.org> Others Giovanni Baronetti and Mauro Borghi <mauro.borghi@tilab.com> @@ -415,7 +415,7 @@ Conrad Parker <conrad@metadecks.org> Marcel Janssen <korgull@home.nl> libavcodec MPEG encoder for DXR3 -Dirk Meyer <dmeyer@tzi.de +Dirk Meyer <dmeyer@tzi.de> stdctl patches for xine-ui and fbxine. post filter support for fbxine. diff --git a/debian/dh_xine b/debian/dh_xine new file mode 100644 index 000000000..93657a86c --- /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', 'libxine2-x'); + + delsubstvar($package, 'xine-console:Depends'); + addsubstvar ($package, 'xine-console:Depends', 'libxine2-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/rules b/debian/rules index fffb497e5..8c7a7b377 100755 --- a/debian/rules +++ b/debian/rules @@ -144,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/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c index fbb20dca3..e8199be0e 100644 --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.c @@ -357,7 +357,20 @@ static void *demux_mod_init_plugin (xine_t *xine, void *data) { this->demux_class.open_plugin = open_plugin; this->demux_class.description = N_("ModPlug Amiga MOD Music file demux plugin"); this->demux_class.identifier = "mod"; - this->demux_class.mimetypes = NULL; + this->demux_class.mimetypes = + "audio/x-mod: mod: SoundTracker/NoiseTracker/ProTracker Module;" + "audio/mod: mod: SoundTracker/NoiseTracker/ProTracker Module;" + "audio/it: it: ImpulseTracker Module;" + "audio/x-it: it: ImpulseTracker Module;" + "audio/x-stm: stm: ScreamTracker 2 Module;" + "audio/x-s3m: s3m: ScreamTracker 3 Module;" + "audio/s3m: s3m: ScreamTracker 3 Module;" + "application/playerpro: 669: 669 Tracker Module;" + "application/adrift; amf: ADRIFT Module File;" + "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;" + "audio/x-amf; amf: ADRIFT Module File;" + "audio/x-xm; xm: FastTracker II Audio;" + "audio/xm; xm: FastTracker II Audio;"; this->demux_class.extensions = "mod it stm s3m 669 amf med mdl xm"; this->demux_class.dispose = default_demux_class_dispose; diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index df754c97f..71defc285 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -21,7 +21,7 @@ /* mpeg1 encoding video out plugin for the dxr3. * * modifications to the original dxr3 video out plugin by - * Mike Lampard <mike at web2u.com.au> + * Mike Lampard <mlampard at users.sourceforge.net> * this first standalone version by * Harm van der Heijden <hrm at users.sourceforge.net> */ |