--- cplay-1.49.orig/debian/control +++ cplay-1.49/debian/control @@ -0,0 +1,26 @@ +Source: cplay +Section: sound +Priority: optional +Maintainer: Peter Samuelson +Uploaders: Jesus Climent +Build-Depends-Indep: debhelper (>= 4.1.51), gettext, dpatch +Standards-Version: 3.6.2 + +Package: cplay +Architecture: all +Depends: python +Recommends: vorbis-tools, python-pyvorbis +Suggests: mpg321 | madplay | splay | mpg123, speex, mikmod, xmp, sox, python-id3 (>= 1.2-1) +Conflicts: madplay (<< 0.15) +Description: A front-end for various audio players + cplay provides a user-friendly interface to play various types of + sound files. It offers a simple file list with which you can + navigate around looking for audio files and a playlist to which + you can add the files you want to play. cplay can play the songs + in your playlist in repeat or random mode, and offers the option + to store the playlist. + . + Currently, the following audio formats are supported: MP3 (through + madplay, mpg321 or splay), Ogg Vorbis (through ogg123), MOD and + other module formats (through mikmod or xmp), WAV (through sox) and + Speex (through speex). --- cplay-1.49.orig/debian/watch +++ cplay-1.49/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://www.tf.hut.fi/~flu/cplay/cplay-(.*)\.tar\.gz debian uupdate --- cplay-1.49.orig/debian/cplay.menu +++ cplay-1.49/debian/cplay.menu @@ -0,0 +1,2 @@ +?package(cplay):needs="text" section="Apps/Sound" \ + title="cplay" command="/usr/bin/cplay" --- cplay-1.49.orig/debian/compat +++ cplay-1.49/debian/compat @@ -0,0 +1 @@ +4 --- cplay-1.49.orig/debian/copyright +++ cplay-1.49/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Martin Michlmayr on +Sat, 9 Sep 2000 12:59:07 +0200. + +It was downloaded from http://www.tf.hut.fi/~flu/cplay/ + +Upstream author: Ulf Betlehem + +Copyright: + +Copyright (C) 1998-2003 Ulf Betlehem + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA + 02110-1301, USA. + +The complete text of the GNU General Public License, version 2, can be +found in /usr/share/common-licenses/GPL-2 --- cplay-1.49.orig/debian/cplay.dirs +++ cplay-1.49/debian/cplay.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/locale +usr/share/man/man1 --- cplay-1.49.orig/debian/cplay.examples +++ cplay-1.49/debian/cplay.examples @@ -0,0 +1,2 @@ +cplayrc +lircrc --- cplay-1.49.orig/debian/cplay.docs +++ cplay-1.49/debian/cplay.docs @@ -0,0 +1,2 @@ +README +TODO --- cplay-1.49.orig/debian/rules +++ cplay-1.49/debian/rules @@ -0,0 +1,53 @@ +#!/usr/bin/make -f +# Copyright (C) 2000, 2002, 2003 Martin Michlmayr +# GNU copyright 1997 to 1999 by Joey Hess. + +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make +destdir := $(shell pwd)/debian/cplay + +build: build-stamp +build-stamp: patch-stamp + dh_testdir + $(MAKE) all cplayrc + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + rm -f cplayrc + -$(MAKE) clean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(destdir) + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installmenu + dh_installmanpages + dh_installchangelogs ChangeLog + dh_installexamples + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +binary-arch: build install +# We have nothing to do + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- cplay-1.49.orig/debian/changelog +++ cplay-1.49/debian/changelog @@ -0,0 +1,485 @@ +cplay (1.49-10) unstable; urgency=low + + * Move to debhelper compatibility level 4 + * Standards-Version 3.6.2 (no changes) + * debian/patches/*.dpatch: rediff, use sane (i.e. current) dpatch headers + * Rebuild cplayrc since at least one cplay patch affects it + * Ship lircrc in doc/examples/ - untested as I don't have hardware + - New patch debian/patches/20_lircrc: fix control socket path + * debian/copyright: FSF moved again + * debian/cplay.menu: quote a string to make lintian happy + + -- Peter Samuelson Tue, 13 Sep 2005 14:47:06 -0500 + +cplay (1.49-9) unstable; urgency=high + + * debian/patches/10_cplay-tmp.dpatch: Fix syntax error. + + -- Martin Michlmayr Sun, 28 Aug 2005 02:47:22 +0100 + +cplay (1.49-8) unstable; urgency=high + + * debian/patches/10_cplay-tmp.dpatch: Updated patch by Peter Samuelson + to address more security races; thanks to Joey Hess for finding an + attack vector not addresses in the previous patch (Closes: #324913). + * debian/control (Maintainer): add Peter Samuelson, remove myself. + + -- Martin Michlmayr Sat, 27 Aug 2005 16:17:56 +0100 + +cplay (1.49-7) unstable; urgency=low + + * debian/patches/13_cplay-support-url: support URL streams given on + the command line. Thanks, Georg Lehner (Closes: #288700). + * debian/patches/00list: add file. + + * debian/control: add Peter Samuelson as uploader. + + -- Martin Michlmayr Sun, 16 Jan 2005 17:57:11 +0000 + +cplay (1.49-6) unstable; urgency=medium + + * debian/patches/10_cplay-tmp.dpatch: create the FIFO if it doesn't + exist yet. Thanks, Johannes Kolb (Closes: #272021). + * debian/patches/10_cplay-tmp.dpatch: add compatibility with Python + 2.2.x and lower. Suggested by Johannes Kolb. + * debian/patches/00list: add file. + + -- Martin Michlmayr Mon, 27 Sep 2004 21:58:20 +0100 + +cplay (1.49-5) unstable; urgency=low + + * debian/patches/12_cplay-ogg123-flac.dpatch: ogg123 can also + handle .flac files (Closes: #258753). + * debian/patches/00list: add file. + + -- Martin Michlmayr Fri, 13 Aug 2004 16:01:18 +0100 + +cplay (1.49-4) unstable; urgency=medium + + * 10_cplay-tmp.dpatch: only open the control file for reading + instead of append-opening it, otherwise cplay will use all + CPU trying to read from the file. Thanks to Peter Samuelson + for reporting and Giuseppe Ciotta for diagnosing this problem + (Closes: #256311). + * 10_cplay-tmp.dpatch: restore the current path in all cases. + + -- Martin Michlmayr Sun, 27 Jun 2004 14:42:20 +0100 + +cplay (1.49-3) unstable; urgency=medium + + * patches/10_cplay-tmp.dpatch: Fix insecure /tmp handling which + could be used for a DoS. Thanks for Matt Zimmerman for giving + me advice about this problem (Closes: #255768). + * debian/patches/00list: Add file. + + * patches/11_cplay-meta.dpatch: Show OGG meta data when the OGG + module is installed but not the MP3 ID3 module (Closes: + #245130). + * debian/patches/00list: Add file. + + * debian/control: Add Jesus Climent as + an uploader since he to act as my backup for this package. + + -- Martin Michlmayr Wed, 23 Jun 2004 00:37:31 +0100 + +cplay (1.49-2) unstable; urgency=low + + * debian/copyright: add copyright statement, in order to fulfil + policy 12.5. Noted by Peter Palfrader on debian-legal. + + -- Martin Michlmayr Mon, 15 Dec 2003 10:29:56 +1100 + +cplay (1.49-1) unstable; urgency=low + + * New upstream release. + + * The new upstream now supports /etc/cplayrc and ~/.cplayrc. + * debian/patches/03_cplay-home-cplayrc.dpatch: Remove file. + * debian/patches/00list: Remove above mentioned file. + + * speex support is now in upstream. + * debian/patches/04_cplay-speex.dpatch: Remove file. + * debian/patches/00list: Remove above mentioned file. + + * Jean-Nicolas Kuttler's patch fixing playlist support (#207761) + got applied upstream. + * debian/patches/05-cplay-playlist.dpatch: Remove file. + * debian/patches/00list: Remove above mentioned file. + + * The new upstream release adds support for ossaudiodev, and at + the same time deprecates (but does not remove) support for the + oss module. The ossaudiodev module recognizes the MIXERDEV + environment variable (Closes: #217911). + * debian/control (Depends): Remove python-oss. + + -- Martin Michlmayr Fri, 05 Dec 2003 23:23:01 +1100 + +cplay (1.48-4) unstable; urgency=low + + * debian/NEWS: New file to document important user-visible changes + since Debian GNU/Linux 3.0 (woody). Thanks to David B Harris + for proofreading this. + * debian/control: Add versioned build-depend on debhelper 4.1.51 or + higher. + + * debian/control (Suggests): Really add xmp (see 1.48-1). + + -- Martin Michlmayr Sat, 18 Oct 2003 18:01:40 +1000 + +cplay (1.48-3) unstable; urgency=low + + * Recognize .m3u and .pls files as playlists again (Closes: #207761). + * debian/patches/05-cplay-playlist.dpatch: New file. Patch by + Jean-Nicolas Kuttler. + * debian/patches/00list: added 05-cplay-playlist. + + * After adding Speex support, I forgot to update the description. + * debian/control (Description): Mention speex. + + -- Martin Michlmayr Sat, 30 Aug 2003 23:18:11 +1000 + +cplay (1.48-2) unstable; urgency=low + + * Include a sample cplayrc file as an example (Closes: #207618). + * debian/rules: Add a call to dh_installexamples. + + * Add Speex support (Closes: #207376). + * debian/patches/04_cplay-speex.dpatch: New file. + * debian/patches/00list: added 04_cplay-speex + * debian/control (Suggests): Add speex. + + -- Martin Michlmayr Thu, 28 Aug 2003 21:05:49 +1000 + +cplay (1.48-1) unstable; urgency=low + + * New upstream release. + + * Some patches got applied upstream. + * debian/patches/03_cplay-mpg123-http-stream.dpatch: Remove file. + * debian/patches/04_cplay-status-recursive-tag.dpatch: likewise. + * debian/patches/05_cplay-ctrl-c-curses-endwin.dpatch: likewise. + * debian/patches/00list: Remove above mentioned files. + + * Some new players are supported now (Closes: #191065). + * debian/control (Suggests): Add xmp. + * debian/control (Suggests): Add sox. + * debian/control (Description): Mention xmp and sox. + + * Upstream uses the OSS module to adjust the volume so this works on + little-endian and big-machines now (Closes: #196483). + * This change also coincidentally removes some code which causes + a FutureWarning in Python 2.3 (Closes: #207215). + * debian/control (Depends): Add python-oss + + * You can now define your own players (Closes: #174865). Upstream + only supports /etc/cplayrc but we'll also support ~/.cplayrc + files. I suggest you use the latter. Also note that the format + of the configuration file might change in the future. + * debian/patches/03_cplay-home-cplayrc.dpatch: New file. + * debian/patches/00list: added 03_cplay-home-cplayrc + + * The new upstream uses a new feature of madplay in order to show + better time information. This requires madplay 0.15 or higher. + * debian/control (Conflicts): Conflict with older madplay releases. + + -- Martin Michlmayr Wed, 27 Aug 2003 00:26:08 +1000 + +cplay (1.47-3) unstable; urgency=low + + * Don't show a status message for each file when when adding multiple + files (Closes: #193041). + * debian/patches/04_cplay-status-recursive-tag.patch: New file. + * debian/patches/00list: added 04_cplay-status-recursive-tag + + * Catch a python curses exception when Ctrl-C is pressed after cplay + is called like "find -name test.ogg | xargs cplay" (Closes: #163778). + (Note that you can simply call it with "find -name test.ogg | cplay", + then this error never occured.) + * debian/patches/05_cplay-ctrl-c-curses-endwin.dpatch: New file. + Thanks to Moshe Zadka. + * debian/patches/00list: added 05_cplay-ctrl-c-curses-endwin + + * debian/patches/03_cplay-mpg123-http-stream.dpatch (DP): Document that + this patch fixes #191977. + + -- Martin Michlmayr Tue, 13 May 2003 01:35:14 +1000 + +cplay (1.47-2) unstable; urgency=low + + * Add debian/patches/03_cplay-mpg123-http-stream.dpatch to support + HTTP streams for mpg123 (Closes: #191977). + + -- Martin Michlmayr Mon, 05 May 2003 21:21:16 +1000 + +cplay (1.47-1) unstable; urgency=low + + * New upstream release. + + * Move to dpatch; existing changes split into 01_Makefile-paths + and 02_cplay-locale. + * debian/rules: include /usr/share/dpatch/dpatch.make. + * debian/rules (build): depend on patch-stamp. + * debian/rules (clean): depend on unpatch. + * debian/control (Build-Depends): add dpatch. + + * Build with new debhelper so /usr/doc symlinks are no longer set. + * debian/control (Standards-Version): bump to 3.5.9. + + * debian/rules: update copyright. + + * debian/copyright: lowercase "Author". + + -- Martin Michlmayr Thu, 24 Apr 2003 00:08:31 +1000 + +cplay (1.46-1) unstable; urgency=low + + * New upstream release: + - All Debian specific modifications made from 1.45-2 to + 1.45-12 are now part of upstream. In some cases, the + Debian patch was taken, in other cases a different fix + has been implemented. + - Send SIGINT instead of SIGTERM to players. This ensures + that the audio device is closed before playing a new + song (Closes: #172718). + - There are several user visible changes: + - "q" doesn't quit immediately anymore but asks for + confirmation. Use "Q" for a direct quit. + - ID3 and OGG meta data is not shown by default anymore. + Rather, there are different view modes which can be + changed with "l": filename (the default), pathname and + metadata. + - Space doesn't add a song to the playlist anymore; you + have to use "a". (You can also tag the files with space + and then press "a" once to add them.) + - See the ChangeLog for more information. + * cplay, README: remove most Debian specific patches. + + -- Martin Michlmayr Thu, 19 Dec 2002 20:18:48 +0100 + +cplay (1.45-12) unstable; urgency=low + + * cplay: Apply patch from upstream which deals with a curses error + upon terminal resize (Closes: #165801). + + -- Martin Michlmayr Sun, 27 Oct 2002 14:21:12 +0100 + +cplay (1.45-11) unstable; urgency=low + + * cplay: Apply patch from upstream to toggle between pathname and filename + sorting (Closes: #164105). + + -- Martin Michlmayr Wed, 16 Oct 2002 17:52:30 +0200 + +cplay (1.45-10) unstable; urgency=low + + * cplay: Catch another UnicodeError (Closes: #163402). + * debian/control: Upgrade vorbis-tools to Recommends again (see #79141). + With blessings from Lazarus Long. Also upgrade python-pyvorbis + to Recommends. + * debian/watch: Update to uscan version 2. + * debian/rules: Remove some cruft. + + -- Martin Michlmayr Fri, 30 Aug 2002 17:32:56 +0100 + +cplay (1.45-9) unstable; urgency=low + + * Fix an UnboundLocalError exception. I forgot the brackets around + two exceptions after an except so the latter one was thought to + be a local variable. Patch provided by Moshe Zadka, thanks! + (Closes: #158842). + + -- Martin Michlmayr Fri, 30 Aug 2002 11:30:29 +0100 + +cplay (1.45-8) unstable; urgency=low + + * Actually allow to play songs which are given as http:// URLs in the + playlist. Patch provided by Toni Timonen, thanks! (Closes: #155592) + * Show the full http:// URL, not just the basename (both in the playlist + and during playing). + * Don't try to get the ID3/OGG tag for http:// files. + * Don't fail when trying to forward in an http:// file. + + -- Martin Michlmayr Tue, 06 Aug 2002 18:13:17 +0200 + +cplay (1.45-7) unstable; urgency=low + + * Only update the status bar and time when something has changed. + This makes cplay usable over slow links. Patch provided by + Ralf Neubauer, thanks! (Closes: #152735) + * If a directory entry is changed don't show "Reading directory" + since this is ugly while playing a song (especially over slow + links). + * When reading a playlist, don't print each song title. This + makes loading a long playlist really slow. Simply print a + message saying that the songs from the playlist are being loaded. + * Make parsing of the playlist slighly faster. + + -- Martin Michlmayr Fri, 12 Jul 2002 18:00:30 +0200 + +cplay (1.45-6) unstable; urgency=low + + * Catch UnicodeError when obtaining the OGG Vorbis tags. Python 2.1 + seems to raise this exception erroneously in some cases (however, + Python 2.2 doesn't). Catching the exception is a good idea in + any case. cplay will display the filename if an UnicodeError + occurs (Closes: #148206). + + -- Martin Michlmayr Wed, 05 Jun 2002 00:00:42 +0200 + +cplay (1.45-5) unstable; urgency=low + + * Don't abort when the window has less lines as the help screen. + Instead, offer scrolling in the help screen (Closes: #146578). + + -- Martin Michlmayr Mon, 13 May 2002 22:43:10 +0200 + +cplay (1.45-4) unstable; urgency=medium + + * Don't fail when the ID3 module returns the InvalidTagError + exception (Closes: #144628). + + -- Martin Michlmayr Fri, 26 Apr 2002 17:03:46 +0200 + +cplay (1.45-3) unstable; urgency=low + + * Don't fail when displaying ID3 tags which contain 8 bit characters. + + -- Martin Michlmayr Sun, 14 Apr 2002 16:41:53 +0200 + +cplay (1.45-2) unstable; urgency=low + + * cplay, README: Apply patch to show ID3 and Ogg Vorbis tags when + playing such files (Closes: #123092). + * debian/control: Add python-pyvorbis and python-id3 (>= 1.2-1) to + suggests in order to obtain OGG Vorbis and ID3 tags. + + -- Martin Michlmayr Sat, 06 Apr 2002 19:09:06 +0200 + +cplay (1.45-1) unstable; urgency=low + + * New upstream release: + - Madplay support works now. + - You can control PCM and MASTER volume + * debian/control: Add madplay to Suggests and update description. + + -- Martin Michlmayr Fri, 29 Mar 2002 18:35:33 +0100 + +cplay (1.44-1) unstable; urgency=low + + * New upstream release: + - Adds partial support for madplay and mikmod. + - Removes sox support. + - Has fixes for the last 3 bugs which were closed via + Debian revisions (ignore dotfiles, ignore .. in /, + don't print TERMIOS warning). + * debian/control: Add mikmod to Suggests, remove sox from Recommends + and update description. + * madplay support doesn't seem to work, so disable it for now. + + -- Martin Michlmayr Sat, 01 Dec 2001 19:19:20 +0100 + +cplay (1.43-4) unstable; urgency=low + + * Don't show dot files and dot directories in the file list (Closes: + #121410). + * Don't show ../ in the file list when you are in / (Closes: #121721). + * Minor changes to the description as suggested by Matt Zimmerman + . + + -- Martin Michlmayr Thu, 29 Nov 2001 14:34:53 +0100 + +cplay (1.43-3) unstable; urgency=low + + * Include TERMIOS when Python 1.5 is used (Closes: #118571). + + -- Martin Michlmayr Wed, 07 Nov 2001 17:45:34 +0100 + +cplay (1.43-2) unstable; urgency=low + + * Depend on python instead of python-base. Needed for the transition + to Python 2.1. + * Don't try to import TERMIOS but only termios because the former is + deprecated. + + -- Martin Michlmayr Sun, 04 Nov 2001 11:54:05 +0100 + +cplay (1.43-1) unstable; urgency=low + + * New upstream release. + * Fixed typo in description (Closes: #89766). + * Minor change to URL in debian/copyright. + * Yes, finally a free mpg123 drop in replacement. Adding mpg321 to + Suggests. + + -- Martin Michlmayr Sat, 17 Mar 2001 13:42:47 +0000 + +cplay (1.42-3) unstable; urgency=low + + * Fixed exception error when playing songs with players not supporting + the status bar (sox and splay). + + -- Martin Michlmayr Fri, 19 Jan 2001 17:52:37 +0000 + +cplay (1.42-2) unstable; urgency=low + + * Added support for splay (Closes: #82830). + + -- Martin Michlmayr Fri, 19 Jan 2001 10:09:20 +0000 + +cplay (1.42-1) unstable; urgency=low + + * New upstream release. + * Updated Standards-Version (no changes). + + -- Martin Michlmayr Thu, 18 Jan 2001 18:17:36 +0000 + +cplay (1.41-4) unstable; urgency=low + + * Made cplay work with Python 1.5 (Closes: #82545). + * Fixed DevFS support. + * Removed emacs cruft from debian/changelog. + + -- Martin Michlmayr Tue, 16 Jan 2001 20:23:20 +0000 + +cplay (1.41-3) unstable; urgency=low + + * Tell ogg123 which device to use to play sound (Closes: #81114). + + -- Martin Michlmayr Wed, 03 Jan 2001 16:14:51 +0100 + +cplay (1.41-2) unstable; urgency=low + + * Downgraded vorbis-tools to Suggests since it's only beta software + and because the format is not very common yet (Closes: #79141). + + -- Martin Michlmayr Sat, 09 Dec 2000 12:49:37 +0000 + +cplay (1.41-1) unstable; urgency=low + + * New upstream release. Since cplay supports an increasing number of + back-ends, the title was changed to something more general. Adapting + the Description accordingly. + * Upstream supports playing Ogg Vorbis files through ogg123 now. Thus + putting vorbis-tools in Recommends. + * Fixed path of man page. + + -- Martin Michlmayr Fri, 08 Dec 2000 16:55:27 +0000 + +cplay (1.40-1) unstable; urgency=low + + * New upstream release. + * Man page is now part of upstream. + * Fixed Build-Depends-Indep. + + -- Martin Michlmayr Thu, 19 Oct 2000 17:28:14 +0100 + +cplay (1.35-1) unstable; urgency=low + + * Initial Release (Closes: #71739). + * Adjusted PREFIX in Makefile. + * Removed information about installation from README. + * Added information about obtaining Debian packages to play sound. + * Fixed locale support. + + -- Martin Michlmayr Thu, 12 Oct 2000 21:47:56 +0100 + --- cplay-1.49.orig/debian/NEWS +++ cplay-1.49/debian/NEWS @@ -0,0 +1,29 @@ +cplay (1.48-1) unstable; urgency=medium + + It is now possible to have user-defined players in your ~/.cplayrc + configuration file or in the system-wide /etc/cplayrc. An example + file can be found in /usr/share/doc/cplay/examples/cplayrc. Please + note that you're also welcome to file a wishlist bug on the cplay + package if a player in Debian is not supported by cplay. + + -- Martin Michlmayr Wed, 27 Aug 2003 00:26:08 +1000 + +cplay (1.46-1) unstable; urgency=high + + In this release of cplay, three changes have been made regarding key + bindings. If you have used the version of cplay in Debian GNU/Linux + 3.0 (woody), version 1.45-3, then it might take some time to get used + to these changes. First, quitting cplay with the lowercase "q" now + asks for confirmation. If you want to quit directly, you have to use + uppercase "Q". Second, hitting space on a song in the filelist no + longer adds it to the playlist immediately - instead, it tags the song. + To add all tagged files to the playlist, press "a". If there are no + tagged files and you press "a", the selected file is added to the + playlist. Third, metadata of the songs (such as artist and title) are + no longer shown by default. However, you can change which information + is displayed with "l". By the default, the filename of the song is + shown. In the playlist, you can also choose pathname (the filename + including the whole path) and metadata (artist and title). + + -- Martin Michlmayr Thu, 19 Dec 2002 20:18:48 +0100 + --- cplay-1.49.orig/debian/patches/20_lircrc.dpatch +++ cplay-1.49/debian/patches/20_lircrc.dpatch @@ -0,0 +1,88 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_lircrc.dpatch by Peter Samuelson +## +## DP: Account for /tmp security patch in lircrc. + +@DPATCH@ +diff -urNad cplay/lircrc cplay/lircrc +--- cplay/lircrc ++++ cplay/lircrc +@@ -3,7 +3,7 @@ + button = SKIP_FORWARD_DOWN + prog = irexec + repeat = 0 +- config = echo "next" > /var/tmp/cplay_control ++ config = echo "next" > ${TMPDIR-/tmp}/cplay-control-$USER + end + + begin +@@ -11,7 +11,7 @@ + button = SKIP_BACKWARD_DOWN + prog = irexec + repeat = 0 +- config = echo "prev" > /var/tmp/cplay_control ++ config = echo "prev" > ${TMPDIR-/tmp}/cplay-control-$USER + end + + begin +@@ -19,7 +19,7 @@ + button = REWIND_DOWN + prog = irexec + repeat = 1 +- config = echo "backward" > /var/tmp/cplay_control ++ config = echo "backward" > ${TMPDIR-/tmp}/cplay-control-$USER + end + + begin +@@ -27,7 +27,7 @@ + button = FORWARD_DOWN + prog = irexec + repeat = 1 +- config = echo "forward" > /var/tmp/cplay_control ++ config = echo "forward" > ${TMPDIR-/tmp}/cplay-control-$USER + end + + begin +@@ -35,7 +35,7 @@ + button = PLAY_DOWN + prog = irexec + repeat = 0 +- config = echo "play" > /var/tmp/cplay_control ++ config = echo "play" > ${TMPDIR-/tmp}/cplay-control-$USER + end + + begin +@@ -43,7 +43,7 @@ + button = STOP_DOWN + prog = irexec + repeat = 0 +- config = echo "stop" > /var/tmp/cplay_control ++ config = echo "stop" > ${TMPDIR-/tmp}/cplay-control-$USER + end + + begin +@@ -51,7 +51,7 @@ + button = VOLUME_UP_DOWN + prog = irexec + repeat = 1 +- config = echo "volup" > /var/tmp/cplay_control ++ config = echo "volup" > ${TMPDIR-/tmp}/cplay-control-$USER + end + + begin +@@ -59,7 +59,7 @@ + button = VOLUME_DOWN_DOWN + prog = irexec + repeat = 1 +- config = echo "voldown" > /var/tmp/cplay_control ++ config = echo "voldown" > ${TMPDIR-/tmp}/cplay-control-$USER + end + + begin +@@ -67,5 +67,5 @@ + button = POWER_DOWN + prog = irexec + repeat = 0 +- config = echo "quit" > /var/tmp/cplay_control ++ config = echo "quit" > ${TMPDIR-/tmp}/cplay-control-$USER + end --- cplay-1.49.orig/debian/patches/02_cplay-locale.dpatch +++ cplay-1.49/debian/patches/02_cplay-locale.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_cplay-locale.dpatch by Martin Michlmayr +## +## DP: Use the correct locale directory + +@DPATCH@ +diff -urNad cplay-1.49/cplay cplay-1.49/cplay +--- cplay-1.49/cplay ++++ cplay-1.49/cplay +@@ -45,7 +45,7 @@ + + # ------------------------------------------ + _locale_domain = "cplay" +-_locale_dir = "/usr/local/share/locale" ++_locale_dir = "/usr/share/locale" + + try: + import gettext # python 2.0 --- cplay-1.49.orig/debian/patches/12_cplay-ogg123-flac.dpatch +++ cplay-1.49/debian/patches/12_cplay-ogg123-flac.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## cplay-ogg123-flac.dpatch by Martin Michlmayr +## +## DP: ogg123 can also play .flac files (#258753) + +@DPATCH@ +diff -urNad cplay-1.49/cplay cplay-1.49/cplay +--- cplay-1.49/cplay ++++ cplay-1.49/cplay +@@ -1648,7 +1648,7 @@ + + # ------------------------------------------ + PLAYERS = [ +- FrameOffsetPlayer("ogg123 -q -v -k %d %s", "\.ogg$"), ++ FrameOffsetPlayer("ogg123 -q -v -k %d %s", "\.(ogg|flac)$"), + FrameOffsetPlayer("splay -f -k %d %s", "(^http://|\.mp[123]$)", 38.28), + FrameOffsetPlayer("mpg123 -q -v -k %d %s", "(^http://|\.mp[123]$)", 38.28), + FrameOffsetPlayer("mpg321 -q -v -k %d %s", "(^http://|\.mp[123]$)", 38.28), --- cplay-1.49.orig/debian/patches/11_cplay-meta.dpatch +++ cplay-1.49/debian/patches/11_cplay-meta.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_cplay-meta.dpatch by Martin Michlmayr +## +## DP: Fix wrong meta data handling (#245130) + +@DPATCH@ +diff -urNad cplay-1.49/cplay cplay-1.49/cplay +--- cplay-1.49/cplay ++++ cplay-1.49/cplay +@@ -906,11 +906,20 @@ + + def command_change_viewpoint(self, klass=PlaylistEntry): + if not globals().get("ID3"): ++ global ID3, ogg, codecs ++ have_meta = 0 + try: +- global ID3, ogg, codecs +- import ID3, ogg.vorbis, codecs ++ import ID3 ++ have_meta = 1 ++ except ImportError: ++ pass ++ try: ++ import ogg.vorbis, codecs ++ have_meta = 1 ++ except ImportError: ++ pass ++ if have_meta: + klass.vps.append([_("metadata"), klass.vp_metadata]) +- except ImportError: pass + TagListWindow.command_change_viewpoint(self, klass) + + def get_title(self): --- cplay-1.49.orig/debian/patches/10_cplay-tmp.dpatch +++ cplay-1.49/debian/patches/10_cplay-tmp.dpatch @@ -0,0 +1,56 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_cplay-tmp.dpatch by Martin Michlmayr +## Peter Samuelson +## +## DP: Adjust PREFIX and install the man page in the right directory + +@DPATCH@ +diff -urNad cplay-1.49/Makefile cplay-1.49/Makefile +--- cplay-1.49/Makefile ++++ cplay-1.49/Makefile +@@ -1,4 +1,4 @@ +-PREFIX = /usr/local ++PREFIX = $(DESTDIR)/usr + ENV = PREFIX=$(PREFIX) + + SUBDIRS = po +@@ -7,7 +7,7 @@ + + install: recursive-install + install -c -m 755 cplay $(PREFIX)/bin +- install -c -m 644 cplay.1 $(PREFIX)/man/man1 ++ install -c -m 644 cplay.1 $(PREFIX)/share/man/man1 + + clean: recursive-clean + --- cplay-1.49.orig/debian/patches/00list +++ cplay-1.49/debian/patches/00list @@ -0,0 +1,7 @@ +01_Makefile-paths +02_cplay-locale +10_cplay-tmp +11_cplay-meta +12_cplay-ogg123-flac +13_cplay-support-url +20_lircrc --- cplay-1.49.orig/debian/patches/13_cplay-support-url.dpatch +++ cplay-1.49/debian/patches/13_cplay-support-url.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## cplay-support-url by Georg Lehner +## +## DP: support URL streams given on the command line (#288700) + +@DPATCH@ +diff -urNad cplay-1.49/cplay cplay-1.49/cplay +--- cplay-1.49/cplay ++++ cplay-1.49/cplay +@@ -971,9 +971,11 @@ + try: + if os.path.isdir(pathname): + app.status(_("Working...")) +- self.add_dir(pathname) ++ self.add_dir(os.path.abspath(pathname)) + elif VALID_PLAYLIST(pathname): + self.add_playlist(pathname) ++ elif os.path.isfile(pathname): ++ self.append(PlaylistEntry(os.path.abspath(pathname))) + else: + pathname = self.fix_url(pathname) + self.append(PlaylistEntry(pathname)) +@@ -1636,7 +1638,7 @@ + if opt == "-v": app.mixer("toggle") + if args or playlist: + for i in args or playlist: +- app.win_playlist.add(os.path.abspath(i)) ++ app.win_playlist.add(i) + app.win_tab.change_window() + app.run() + except SystemExit: