From f0910bd350e09a9f5ceee3fd9defda90f4515230 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 22 Mar 2009 00:35:03 +0000 Subject: Fix a few name/address errors. These were noticed while working on xine-lib-deb's debian/copyright. --- AUTHORS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 5260ba4ec..52758d0cf 100644 --- a/AUTHORS +++ b/AUTHORS @@ -235,7 +235,7 @@ Marcelo Roberto Jimenez George Staikos xinerama bugfixes -Juan Manuel Garc? Molina +Juan Manuel García Molina spanish internationalization files. Jeffrey W. Baker @@ -293,7 +293,7 @@ Andrew Patrikalakis powerpc assembly memcpy() implementaions with assistance from Rogerio Brito Benjamin Herrenschmidt - Michel Dzer + Michel Dänzer Others Giovanni Baronetti and Mauro Borghi @@ -415,7 +415,7 @@ Conrad Parker Marcel Janssen libavcodec MPEG encoder for DXR3 -Dirk Meyer stdctl patches for xine-ui and fbxine. post filter support for fbxine. -- cgit v1.2.3 From 271fbfe408a9ee21e72d7c95cec46941b55e5791 Mon Sep 17 00:00:00 2001 From: mlampard-guest Date: Sun, 22 Mar 2009 16:55:47 +1030 Subject: change long-dead email address --- src/dxr3/video_out_dxr3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 3e7c9ab08..189824183 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 Lampard * this first standalone version by * Harm van der Heijden */ -- cgit v1.2.3 From 075a4b4d2ff96d2576993e9dab0bb1532810918e Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 25 Mar 2009 19:28:41 +0000 Subject: Add Mimetypes to src/demuxers/demux_mod.c This patch adds mimetypes to src/demuxers/demux_mod.c for the file types it can handle. After this patch is applied, then xine_get_mime_types() reports them correctly, which allows Amarok 2.x to play them and probably prevents other interoperability problems. Previously Amarok 2.x rejected MOD/S3M/IT/XM/etc. files that were enqueued there when using the xine phonon backend because their mime types were not included in those announced by xine-lib. --- src/demuxers/demux_mod.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c index 073927707..c67f6e18e 100644 --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.c @@ -379,7 +379,19 @@ static const char *get_extensions (demux_class_t *this_gen) { } static const char *get_mimetypes (demux_class_t *this_gen) { - return NULL; + return "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;"; } static void class_dispose (demux_class_t *this_gen) { -- cgit v1.2.3 From 7b0c3fd46c12613ffcc987183ffe13205bbbef82 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 25 Mar 2009 20:15:08 +0000 Subject: Add dh_xine, to be used when building front end .debs. --- debian/dh_xine | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/dh_xine.1 | 21 +++++++++++++++++++++ debian/rules | 2 ++ 3 files changed, 79 insertions(+) create mode 100644 debian/dh_xine create mode 100644 debian/dh_xine.1 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 [S>] + +=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 + +This program is not a part of debhelper. + +=head1 AUTHOR + +Darren Salt + +=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 diff --git a/debian/rules b/debian/rules index e1f66382f..f570098b4 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 -- cgit v1.2.3