--- deadbeef-0.4.3+dfsg.orig/debian/deadbeef.menu +++ deadbeef-0.4.3+dfsg/debian/deadbeef.menu @@ -0,0 +1,3 @@ +?package(deadbeef):needs="X11" section="Applications/Sound" \ + title="Deadbeef" longtitle="Deadbeef Audio Player" \ + command="/usr/bin/deadbeef" --- deadbeef-0.4.3+dfsg.orig/debian/compat +++ deadbeef-0.4.3+dfsg/debian/compat @@ -0,0 +1 @@ +7 --- deadbeef-0.4.3+dfsg.orig/debian/rules +++ deadbeef-0.4.3+dfsg/debian/rules @@ -0,0 +1,27 @@ +#! /usr/bin/make -f + +export DH_ALWAYS_EXCLUDE := COPYING:COPYING.GPLv2:COPYING.LGPLv2.1 + +%: + dh --with quilt --with autoreconf $@ + +override_dh_auto_configure: + dh_auto_configure -- --disable-dumb + +override_dh_makeshlibs: + dh_makeshlibs -n + +override_dh_shlibdeps: + dh_shlibdeps -Xflac.so -Xlastfm.so -Xmpgmad.so -Xffmpeg.so \ + -Xvorbis.so -Xsndfile.so -Xwavpack.so -Xvfs_curl.so \ + -Xnotify.so -Xpulse.so + +override_dh_install: + dh_install --list-missing + @cp ChangeLog debian/deadbeef/usr/share/doc/deadbeef/changelog.deadbeef + +override_dh_installchangelogs: + dh_installchangelogs -k ChangeLog + +override_dh_compress: + dh_compress -Xchangelog.deadbeef -Xabout.txt --- deadbeef-0.4.3+dfsg.orig/debian/control +++ deadbeef-0.4.3+dfsg/debian/control @@ -0,0 +1,77 @@ +Source: deadbeef +Section: sound +Priority: optional +Maintainer: Julien Lavergne +XSBC-Original-Maintainer: Shan-Bin Chen +Build-Depends: debhelper (>= 7.0.50), + quilt (>= 0.46-7), + autotools-dev, + libtool, + libasound2-dev, + libcddb2-dev, + libcdio-dev, + libcurl4-gnutls-dev, + libflac-dev, + libgtk2.0-dev, + libmad0-dev, + libogg-dev, + libsamplerate0-dev, + libsndfile1-dev, + libvorbis-dev, + libwavpack-dev, + libavformat-dev, + libavcodec-dev, + libavutil-dev, + libpulse-dev, + libdbus-1-dev, + libpango1.0-dev, + libx11-dev, + libdumb1-dev, + intltool, + dh-autoreconf +Standards-Version: 3.9.1 +Homepage: http://deadbeef.sourceforge.net/ + +Package: deadbeef-plugins-dev +Architecture: all +Depends: deadbeef, ${misc:Depends} +Description: DeaDBeeF plugins development files + DeaDBeeF (as in 0xDEADBEEF) is an audio player for GNU/Linux systems with X11. + . + This package contains all supplementary files you need to develop your plugins + for DeaDBeeF audio player. + +Package: deadbeef +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: libflac8, libvorbis0a, libvorbisfile3, libmad0, + libogg0, libwavpack1, libsndfile1, libpulse0, libdbus-1-3, + libavformat52 | libavformat-extra-52, + libavcodec52 | libavcodec-extra-52, + libavutil49 | libavutil-extra-49 +Suggests: libcurl3-gnutls +Description: ultimate music player for GNU/Linux systems + DeaDBeeF (as in 0xDEADBEEF) is an audio player for GNU/Linux systems with X11. + . + Features: + . + * mp3, ogg vorbis, flac, ape, wv, wav + * ID3v1, ID3v2.2, ID3v2.3, ID3v2.4, APEv2, xing/info tags support + * character set detection for non-unicode ID3 tags - supports cp1251 + and iso8859-1 + * unicode tags are fully supported as well (both utf8 and ucs2) + * cuesheet support for mp3, ogg, flac, ape + * autodetection of utf8/cp1251/iso8859-1 charsets in cuesheets + * sid and some popular chiptune formats like nsf + * tracker modules like mod, s3m, it, xm, etc + * HVSC song length database support for sid + * gtk2 interface with custom highly speed/memory optimized widgets + * no GNOME or KDE dependencies - just gtk2 and several small libraries + * minimize to tray, with scrollwheel volume control + * drag and drop, both inside of playlist, and from filemanagers and such + * control playback from command line (allows global hotkeys using xbindkeys) + * seeking works in all supported formats + * plugin support; ships with several standard plugins, such as global hotkeys + and last.fm scrobbler; sdk is included + * duration calculation is as precise as possible for vbr mp3 + files (with and without xing/info tags) --- deadbeef-0.4.3+dfsg.orig/debian/deadbeef.1 +++ deadbeef-0.4.3+dfsg/debian/deadbeef.1 @@ -0,0 +1,59 @@ +.TH DEADBEEF 1 "13 January 2010" "0.4.1" "deadbeef manual page" +.SH NAME +deadbeef \- ultimate music player for X. +.SH SYNOPSIS +.B deadbeef +[\fIOptions\fR] [\fIFiles\fR] +.SH DESCRIPTION +\fIDeadbeef\fP DeaDBeeF (as in 0xDEADBEEF) is an audio player for GNU/Linux +systems with X11. +.SH OPTIONS +.SS "Arguments:" +.TP +File(s) +file(s) to open +.SS "Options:" +.TP +.BI \-h,\-\-help +Show help about options +.TP +.BI \-\-play +Start playback +.TP +.BI \-\-stop +Stop playback +.TP +.BI \-\-pause +Pause playback +.TP +.BI \-\-next +Next song in playlist +.TP +.BI \-\-prev +Previous song in playlist +.TP +.BI \-\-random +Random song in playlist +.TP +.BI \-\-queue +Append file(s) to existing playlist +.TP +.BI \-\-version +Print version info and exit +.TP +.BI \-\-nowplaying\ \fIFMT\fR +Print formatted track name to stdout FMT %-syntax: [a]rtist, [t]itle, al[b]um, +[l]ength, track[n]umber, [y]ear, [c]omment, copy[r]ight, [e]lapsed +.SH "AUTHOR" +DeaDBeeF was written by +.nh +.ad l +Alexey Yakovenko +.hy +.br +This manual page was prepared by +.nh +.ad l +Alexey Smirnov +.hy +for the Debian GNU/Linux system (but may be used by others). --- deadbeef-0.4.3+dfsg.orig/debian/deadbeef.manpages +++ deadbeef-0.4.3+dfsg/debian/deadbeef.manpages @@ -0,0 +1 @@ +debian/deadbeef.1 --- deadbeef-0.4.3+dfsg.orig/debian/deadbeef-plugins-dev.install +++ deadbeef-0.4.3+dfsg/debian/deadbeef-plugins-dev.install @@ -0,0 +1 @@ +usr/include/deadbeef/* --- deadbeef-0.4.3+dfsg.orig/debian/copyright +++ deadbeef-0.4.3+dfsg/debian/copyright @@ -0,0 +1,109 @@ +This package was debianized by Alexey Smirnov on +Thu, 20 Aug 2009 14:34:58 +0600. + +It was downloaded from http://sourceforge.net/projects/deadbeef/files + +Upstream Author: + + Alexey Yakovenko + +Copyright: + + This package contains various pieces of software copyrighted + by their respective authors, including: + + Copyright © 2009-2010 by Alexey Yakovenko + Copyright © by Viktor Semykin + Copyright © Stas Akimushkin + +License: + + This package 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 package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +Some parts of the code have other copyright holders or licenses: + +gme/Game_Music_Emu-0.5.2/*: Game Music Emulators + Copyright © 2003-2006 Shay Green + Licensed under LGPL license. + +dumb/*: DUMB - Dynamic Universal Music Bibliotheque + Copyright © 2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere. + + License: + + This software is provided 'as-is', without any express or implied warranty. + In no event shall the authors be held liable for any damages arising from the + use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a + product, you are requested to acknowledge its use in the product + documentation, along with details on where to get an unmodified version of + this software, but this is not a strict requirement. + + [Note that the above point asks for a link to DUMB, not just a mention. + Googling for DUMB doesn't help much! The URL is "http://dumb.sf.net/".] + + [The only reason why the link is not strictly required is that such a + requirement prevents DUMB from being used in projects with certain other + licences, notably the GPL. See http://www.gnu.org/philosophy/bsd.html .] + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed from or altered in any source distribution. + + 4. If you are using the Program in someone else's bedroom at any Monday + 3:05 PM, you are not allowed to modify the Program for ten minutes. [This + clause provided by Inphernic; every licence should contain at least one + clause, the reasoning behind which is far from obvious.] + + [Note: clause 4 was resigned after a quick IRC talk with the author] + + [Note 2: if I did not mention /usr/share/common-licenses here, lintian + would complain because he found the words "GPL" above, but this + software is not GPL. It is GPL-compatible, though.] + +md5/*: Functions to compute MD5 message digest of files or memory blocks + Written by Ulrich Drepper , 1995. + Modified by Gray Watson , 1997. + Licensed under GPL license. + +sid/sidplay-libs-2.1.0/*: commodore 64 SID emulation library + Copyright © 2000-2004 Simon White + Licensed under GPL license. + +plugins/adplug/adplug/*: Replayer for many OPL2/OPL3 audio file formats. + Copyright © 1999 - 2006 Simon Peter , et al. + License under LGPL license. + +plugins/adplug/libbinio/*: binary I/O stream class library + Copyright © 2002-2004 Simon Peter + License under LGPL license. + +plugins/vtx/ay8912.c, plugins/vtx/ayemu.h, plugins/vtx/ayemu_8912.h, +plugins/vtx/auemu_vtxfile.h: AY/YM sound chip emulator and music file loader + Copyright © 2003-2004 Sashnov Alexander + License under LGPL license. + +The Debian packaging is © 2009, Alexey Smirnov and +is licensed under the GPL, see above. --- deadbeef-0.4.3+dfsg.orig/debian/copyrightv2 +++ deadbeef-0.4.3+dfsg/debian/copyrightv2 @@ -0,0 +1,138 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: deadbeef +Maintainer: Julien Lavergne +Source: http://deadbeef.sourceforge.net/ + +Files: * +Copyright: Copyright (C) 2009-2010 Alexey Yakovenko + Copyright (C) 2000-2003 Michel Lespinasse + Copyright (C) 1999-2000 Aaron Holtzman + Copyright (C) 2004 Gildas Bazin + Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com + Copyright (c) 2007 Benjamin Zores + Copyright Takuya OOURA, 1996-2001 + Copyright (C) 2009-2010 Viktor Semykin + Copyright (C) 1997 André Fachat (a.fachat@physik.tu-chemnitz.de) + Copyright (C) 2000-2001 Simon White + Copyright (C) Michael Schwendt + Copyright (C) 2002 Dag Lem + Copyright (C) 1992-1995 Tony Robinson + Copyright (C) 2000-2007 Jason Jordan +License: GPL-2+ + [LICENSE TEXT] + +Files: int/* +Copyright: Copyright (C) 1984-2010 Free Software Foundation, Inc. +License: LGPL-2+ + [LICENSE TEXT] + +Files: int/plural.c +Copyright: +License: LGPL-2+ + [LICENSE TEXT] + +Files: md5/* + deadbeef.h +Copyright: Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved. +License: ZLIB + [LICENSE TEXT] + +Files: plugins/musepack/* + plugins/tta/filter.h + plugins/tta/ttadec.h + plugins/tta/ttadec.c + plugins/ao/* +Copyright: Copyright (c) 2005-2009, The Musepack Development Team + Copyright (C) 1999-2004 Buschmann/Klemm/Piecha/Wolf + Copyright (c) 2004 True Audio Software. All rights reserved. + Copyright (c) 2004 Alexander Djourik. All rights reserved. + Copyright (c) 2007-2008, R. Belmont and Richard Bannister. + Copyright 1998-2001 Karl Stenerud. All rights reserved. + Copyright (C) 1998,1999,2000 Juergen Buchmueller, all rights reserved. +License: BSD + [LICENSE TEXT] + +Files: plugins/musepack/musepack.c +Copyright: +License: GPL-2+ + [LICENSE TEXT] + +Files: plugins/musepack/mpc/minimax.h +Copyright: +License: LGPL-2+ + [LICENSE TEXT] + +Files: plugins/mms/libmms/* +Copyright: Copyright (C) 2007-2010 Hans de Goede + Copyright (C) 2000-2003 David Helder, David Bolcsfoldi, Eric Williams + Copyright (C) 2004 Maciej Katafiasz + Copyright (C) 2002-2004 the xine project + Copyright (c) 2000, 2001 Gerard Lantau. +License: LGPL-2+ + [LICENSE TEXT] + +Files: plugins/mms/libmms/mmsh.c + plugins/mms/libmms/asfheader.h + plugins/mms/libmms/mmsh.h + plugins/mms/libmms/mms.h + plugins/mms/libmms/mms.c + plugins/vtx/* +Copyright: Copyright (C) 2003-2004 Sashnov Alexander +License: GPL-2+ + [LICENSE TEXT] + +Files: plugins/wildmidi/src/* + plugins/wildmidi/include/* + plugins/gme/game-music-emu-*/* + plugins/adplug/* +Copyright: Copyright © 2003-2006 Shay Green + Copyright (C)2001-2004 Chris Ison + Copyright (C) 2002 Brad Martin + Copyright (C) 1999 - 2009 Simon Peter , et al. + Copyright (c) 2002 Riven the Mage + Copyright (C) 1998-2001 Ken Silverman + Copyright (C) 1999,2000 Tatsuyuki Satoh , MultiArcadeMachineEmurator development + Copyright (C) 1989-1991 Ken Turkowski. +License: LGPL-2.1+ + [LICENSE TEXT] + +Files: plugins/adplug/adplug/adl.cpp + plugins/vtx/vtx.c + plugins/ao/plugin.c + plugins/ao/eng_psf/peops/regs.h + plugins/ao/eng_psf/peops/gauss_i.h + plugins/ao/eng_psf/peops/adsr.c + plugins/ao/eng_psf/peops/stdafx.h + plugins/ao/eng_psf/peops/dma.h + plugins/ao/eng_psf/peops/adsr.h + plugins/ao/eng_psf/peops/spu.c + plugins/ao/eng_psf/peops/spu.h + plugins/ao/eng_psf/peops/dma.c + plugins/ao/eng_psf/peops/reverb.c + plugins/ao/eng_psf/peops/externals.h + plugins/ao/eng_psf/peops/registers.c + plugins/ao/eng_psf/peops/registers.h + plugins/ao/eng_psf/peops2/regs.h + plugins/ao/eng_psf/peops2/gauss_i.h + plugins/ao/eng_psf/peops2/spu2.c + plugins/ao/eng_psf/peops2/stdafx.h + plugins/ao/eng_psf/peops2/dma.h + plugins/ao/eng_psf/peops2/adsr.h + plugins/ao/eng_psf/peops2/psemuxa.h + plugins/ao/eng_psf/peops2/spu.h + plugins/ao/eng_psf/peops2/reverb.h + plugins/ao/eng_psf/peops2/externals.h + plugins/ao/eng_psf/peops2/reverb2.c + plugins/ao/eng_psf/peops2/registers.h + plugins/ao/eng_psf/peops2/registers2.c + plugins/ao/eng_psf/peops2/adsr2.c + plugins/ao/eng_psf/peops2/dma2.c +Copyright: Copyright (C) 2006 The ScummVM project + Copyright (C) 2006 Torbjorn Andersson and Johannes Schickel + Copyright 2003 J.F. and Kanodin, and distributed under the +License: GPL-2+ + [LICENSE TEXT] + + +Missing : plugins/dumb/ +Copyright: Copyright (C) 2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere --- deadbeef-0.4.3+dfsg.orig/debian/changelog +++ deadbeef-0.4.3+dfsg/debian/changelog @@ -0,0 +1,160 @@ +deadbeef (0.4.3+dfsg-0ubuntu1~ppa1) maverick; urgency=low + + [ Shan-Bin Chen ] + * Initial release (Closes: #576975) + * Import upstream source code for git-20100805 . + * Use Ubuntu PPA configuration + https://launchpad.net/~alexey-smirnov/+archive/deadbeef + + [ Julien Lavergne ] + * New upstream release (0.4.3) + - Remove copy of dumb. + * debian/patches/ + - changelog_fix.patch: Update. + - debian_native_copying.patch: Update. + - spelling_error.patch: Refresh. + - use_system_libdumb.patch: Use system libdumb1, instead of the copy in the + tarball. + - fix_po_missing.patch: New, add quilt generated files to POTFILES.skip. + * debian/control: + - Build-depends on intltool. + - Build-depends on libdumb1-dev. + - Build-depends on dh-autoreconf. + * debian/rules + - Use --with autoreconf + - Pass --disable-dumb for now, until it's fixed. + - Don't compress about.txt to be available for deadbeef UI. + * debian/deadbeef.install: + - Install locale files. + + -- Julien Lavergne Wed, 10 Nov 2010 23:16:02 +0100 + +deadbeef (0.4.1-1~ppa3) lucid; urgency=low + + * Fix lintian warnings. + * Add libavformat-extra-52, libavcodec-extra-52, libavutil-extra-49 as a + dependency. + + -- Alexey Smirnov Thu, 03 Jun 2010 02:54:54 +0600 + +deadbeef (0.4.1-1~ppa2) lucid; urgency=low + + * No compress ChangeLog (temporary fix). + + -- Alexey Smirnov Sun, 30 May 2010 01:28:57 +0600 + +deadbeef (0.4.1-1~ppa1) lucid; urgency=low + + * New upstream release, deadbeef 0.4.1. + * Move libcddb2/libcdio7 to more strong depends. + * Migrate to 3.8.4 policy. + + -- Alexey Smirnov Sat, 29 May 2010 22:55:25 +0600 + +deadbeef (0.4.0-2) UNRELEASED; urgency=low + + * Fix typo in rules and *.install. + + -- Alexey Smirnov Mon, 10 May 2010 10:36:24 +0600 + +deadbeef (0.4.0-1) UNRELEASED; urgency=low + + * New upstream release, deadbeef 0.4. + * Update control, rules. + + -- Alexey Smirnov Thu, 06 May 2010 00:50:53 +0600 + +deadbeef (0.3.3-1) UNRELEASED; urgency=low + + * New upstream release, deadbeef 0.3.3. + * Update control, manpage. + + -- Alexey Smirnov Sun, 07 Feb 2010 15:42:11 +0500 + +deadbeef (0.3.2-1) UNRELEASED; urgency=low + + * New upstream release, deadbeef 0.3.2. + * Update copyright, control, manpage. + + -- Alexey Smirnov Wed, 13 Jan 2010 14:04:41 +0500 + +deadbeef (0.3.1-2) UNRELEASED; urgency=low + + * Update long description of package. + * Update debian/copyright. + + -- Alexey Smirnov Thu, 24 Dec 2009 01:25:31 +0500 + +deadbeef (0.3.1-1) UNRELEASED; urgency=low + + * New upstream release, deadbeef 0.3.1. + + -- Alexey Smirnov Sun, 29 Nov 2009 13:31:42 +0500 + +deadbeef (0.3.0-1) UNRELEASED; urgency=low + + * New upstream release. + * Add depends: libcddb2, libcdio7. + + -- Alexey Smirnov Sun, 29 Nov 2009 13:28:56 +0500 + +deadbeef (0.2.3.2-1) UNRELEASED; urgency=low + + * New upstream release, bugfix only. + + -- Alexey Smirnov Thu, 08 Oct 2009 19:00:40 +0600 + +deadbeef (0.2.3.1-1) UNRELEASED; urgency=low + + * New upstream release. + * Added new dependencies: libsndfile1 and libwavpack. + + -- Alexey Smirnov Sun, 04 Oct 2009 20:43:23 +0600 + +deadbeef (0.2.2.2-2) UNRELEASED; urgency=low + + * Restructure build rules to use debhelper more, + and migrate to debhelper 7. + + -- Alexey Smirnov Mon, 21 Sep 2009 11:47:25 +0600 + +deadbeef (0.2.2.2-1) UNRELEASED; urgency=low + + * New upstream release, bugfix only. + + -- Alexey Smirnov Sun, 20 Sep 2009 19:38:55 +0600 + +deadbeef (0.2.2.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Alexey Smirnov Mon, 14 Sep 2009 01:42:10 +0600 + +deadbeef (0.2-1) UNRELEASED; urgency=low + + * New upstream release. + * Bumped version-standards to 3.8.3, no changes needed. + * Transferring some of the dependencies in sections Recommends and Suggests. + * Minor changes in copyright and manpages. + * Now create deadbeef and deadbeef-plugins-dev packages. + + -- Alexey Smirnov Sat, 12 Sep 2009 22:02:08 +0600 + +deadbeef (0.1.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Alexey Smirnov Mon, 24 Aug 2009 00:20:26 +0600 + +deadbeef (0.1-2) UNRELEASED; urgency=low + + * Fixed volume control. + * Fixed bug in cvorbis_init preventing some songs from playing. + + -- Alexey Smirnov Sat, 22 Aug 2009 02:41:00 +0600 + +deadbeef (0.1-1) UNRELEASED; urgency=low + + * Initial release. + + -- Alexey Smirnov Sat, 22 Aug 2009 02:39:32 +0600 --- deadbeef-0.4.3+dfsg.orig/debian/README.source +++ deadbeef-0.4.3+dfsg/debian/README.source @@ -0,0 +1,3 @@ +# Thu, 05 Aug 2010 20:42:05 +0800 +changelog_fix.patch , Changelog correct +debian_native_copying.patch , Correct the directory (GPL 2 & LGPL 2.1) --- deadbeef-0.4.3+dfsg.orig/debian/deadbeef.docs +++ deadbeef-0.4.3+dfsg/debian/deadbeef.docs @@ -0,0 +1,3 @@ +NEWS +README +AUTHORS --- deadbeef-0.4.3+dfsg.orig/debian/deadbeef.install +++ deadbeef-0.4.3+dfsg/debian/deadbeef.install @@ -0,0 +1,7 @@ +usr/bin/* +usr/lib/deadbeef/* +usr/share/applications/* +usr/share/deadbeef/* +usr/share/doc/* +usr/share/icons/* +usr/share/locale/* --- deadbeef-0.4.3+dfsg.orig/debian/watch +++ deadbeef-0.4.3+dfsg/debian/watch @@ -0,0 +1,6 @@ +version=3 + +#Offical release url path +http://sf.net/deadbeef/deadbeef-(.*)\.tar\.gz +#deadbeef git +#git://deadbeef.git.sourceforge.net/gitroot/deadbeef/deadbeef --- deadbeef-0.4.3+dfsg.orig/debian/patches/spelling_error.patch +++ deadbeef-0.4.3+dfsg/debian/patches/spelling_error.patch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## DP: Spelling error hotfix +@DPATCH@ + +Index: deadbeef-0.4.3/junklib.c +=================================================================== +--- deadbeef-0.4.3.orig/junklib.c 2010-10-27 20:43:56.000000000 +0200 ++++ deadbeef-0.4.3/junklib.c 2010-11-06 00:42:05.000000000 +0100 +@@ -256,7 +256,7 @@ + "Native American", + "Cabaret", + "New Wave", +- "Psychadelic", ++ "Psychedelic", + "Rave", + "Showtunes", + "Trailer", --- deadbeef-0.4.3+dfsg.orig/debian/patches/series +++ deadbeef-0.4.3+dfsg/debian/patches/series @@ -0,0 +1,5 @@ +changelog_fix.patch +debian_native_copying.patch +spelling_error.patch +use_system_libdumb.patch +fix_po_missing.patch --- deadbeef-0.4.3+dfsg.orig/debian/patches/use_system_libdumb.patch +++ deadbeef-0.4.3+dfsg/debian/patches/use_system_libdumb.patch @@ -0,0 +1,128 @@ +Index: deadbeef-0.4.3/plugins/dumb/Makefile.am +=================================================================== +--- deadbeef-0.4.3.orig/plugins/dumb/Makefile.am 2010-11-10 22:14:02.000000000 +0100 ++++ deadbeef-0.4.3/plugins/dumb/Makefile.am 2010-11-10 22:29:48.000000000 +0100 +@@ -1,107 +1,8 @@ + if HAVE_DUMB +-dumbpath=@top_srcdir@/plugins/dumb/dumb-kode54 +- +-EXTRA_DIST = $(dumbpath)/readme.txt $(dumbpath)/ChangeLog $(dumbpath)/licence.txt $(dumbpath)/release.txt $(dumbpath)/todo.txt +- + pkglib_LTLIBRARIES = dumb.la + +-AM_CFLAGS = $(CFLAGS) -I$(dumbpath)/include ++AM_CFLAGS = $(CFLAGS) -I$/usr/include/dumb.h + dumb_la_LDFLAGS = -module -lm + +-dumb_la_SOURCES =\ +-dumb-kode54/src/it/readam.c\ +-dumb-kode54/src/it/readstm.c\ +-dumb-kode54/src/it/loads3m.c\ +-dumb-kode54/src/it/loadxm.c\ +-dumb-kode54/src/it/ptmeffect.c\ +-dumb-kode54/src/it/loadstm.c\ +-dumb-kode54/src/it/readxm.c\ +-dumb-kode54/src/it/itorder.c\ +-dumb-kode54/src/it/loadpsm.c\ +-dumb-kode54/src/it/itload.c\ +-dumb-kode54/src/it/loadasy2.c\ +-dumb-kode54/src/it/readasy.c\ +-dumb-kode54/src/it/loadasy.c\ +-dumb-kode54/src/it/read669.c\ +-dumb-kode54/src/it/readdsmf.c\ +-dumb-kode54/src/it/reads3m.c\ +-dumb-kode54/src/it/readriff.c\ +-dumb-kode54/src/it/load6692.c\ +-dumb-kode54/src/it/read6692.c\ +-dumb-kode54/src/it/readmod2.c\ +-dumb-kode54/src/it/loadriff2.c\ +-dumb-kode54/src/it/xmeffect.c\ +-dumb-kode54/src/it/loadmod2.c\ +-dumb-kode54/src/it/itread.c\ +-dumb-kode54/src/it/itunload.c\ +-dumb-kode54/src/it/loadmtm2.c\ +-dumb-kode54/src/it/loadptm.c\ +-dumb-kode54/src/it/itload2.c\ +-dumb-kode54/src/it/loadmtm.c\ +-dumb-kode54/src/it/loadoldpsm.c\ +-dumb-kode54/src/it/loadstm2.c\ +-dumb-kode54/src/it/readstm2.c\ +-dumb-kode54/src/it/readptm.c\ +-dumb-kode54/src/it/itrender.c\ +-dumb-kode54/src/it/readoldpsm.c\ +-dumb-kode54/src/it/reads3m2.c\ +-dumb-kode54/src/it/readpsm.c\ +-dumb-kode54/src/it/itread2.c\ +-dumb-kode54/src/it/loads3m2.c\ +-dumb-kode54/src/it/loadpsm2.c\ +-dumb-kode54/src/it/loadxm2.c\ +-dumb-kode54/src/it/loadptm2.c\ +-dumb-kode54/src/it/readxm2.c\ +-dumb-kode54/src/it/itmisc.c\ +-dumb-kode54/src/it/loadoldpsm2.c\ +-dumb-kode54/src/it/readmod.c\ +-dumb-kode54/src/it/loadmod.c\ +-dumb-kode54/src/it/loadriff.c\ +-dumb-kode54/src/it/readmtm.c\ +-dumb-kode54/src/it/load669.c\ +-dumb-kode54/src/core/rendduh.c\ +-dumb-kode54/src/core/readduh.c\ +-dumb-kode54/src/core/duhlen.c\ +-dumb-kode54/src/core/loadduh.c\ +-dumb-kode54/src/core/unload.c\ +-dumb-kode54/src/core/duhtag.c\ +-dumb-kode54/src/core/register.c\ +-dumb-kode54/src/core/rawsig.c\ +-dumb-kode54/src/core/dumbfile.c\ +-dumb-kode54/src/core/rendsig.c\ +-dumb-kode54/src/core/makeduh.c\ +-dumb-kode54/src/core/atexit.c\ +-dumb-kode54/src/helpers/clickrem.c\ +-dumb-kode54/src/helpers/silence.c\ +-dumb-kode54/src/helpers/stdfile.c\ +-dumb-kode54/src/helpers/resample.c\ +-dumb-kode54/src/helpers/riff.c\ +-dumb-kode54/src/helpers/memfile.c\ +-dumb-kode54/src/helpers/sampbuf.c\ +-dumb-kode54/src/helpers/barray.c\ +-dumb-kode54/studio/include/guitop.h\ +-dumb-kode54/studio/include/dumbgui.h\ +-dumb-kode54/studio/include/options.h\ +-dumb-kode54/studio/include/subclip.h\ +-dumb-kode54/studio/include/main.h\ +-dumb-kode54/studio/include/guiproc.h\ +-dumb-kode54/studio/include/dumbmenu.h\ +-dumb-kode54/studio/include/dumbdesk.h\ +-dumb-kode54/src/tools/it/modulus.h\ +-dumb-kode54/include/internal/it.h\ +-dumb-kode54/include/internal/dumb.h\ +-dumb-kode54/include/internal/barray.h\ +-dumb-kode54/include/internal/riff.h\ +-dumb-kode54/include/internal/aldumb.h\ +-dumb-kode54/include/dumb.h\ +-dumb-kode54/include/aldumb.h\ +-dumb-kode54/winamp/in_duh.h\ +-dumb-kode54/winamp/in2.h\ +-dumb-kode54/winamp/resource.h\ +-dumb-kode54/winamp/out.h\ +-dumb-kode54/winamp/gui.h\ +-dumb-kode54/src/helpers/resample.inc\ +-dumb-kode54/src/helpers/resamp2.inc\ +-dumb-kode54/src/helpers/resamp3.inc\ +-cdumb.c ++dumb_la_SOURCES =cdumb.c + endif +Index: deadbeef-0.4.3/plugins/dumb/cdumb.c +=================================================================== +--- deadbeef-0.4.3.orig/plugins/dumb/cdumb.c 2010-11-10 22:14:02.000000000 +0100 ++++ deadbeef-0.4.3/plugins/dumb/cdumb.c 2010-11-10 22:30:18.000000000 +0100 +@@ -21,8 +21,7 @@ + #include + #include + #include +-#include "dumb.h" +-#include "internal/it.h" ++#include + #include "../../deadbeef.h" + + //#define trace(...) { fprintf(stderr, __VA_ARGS__); } --- deadbeef-0.4.3+dfsg.orig/debian/patches/changelog_fix.patch +++ deadbeef-0.4.3+dfsg/debian/patches/changelog_fix.patch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## PPA upstream patch +## DP: Changelog correct + +@DPATCH@ +Index: deadbeef-0.4.3/plugins/gtkui/callbacks.c +=================================================================== +--- deadbeef-0.4.3.orig/plugins/gtkui/callbacks.c 2010-10-26 20:47:58.000000000 +0200 ++++ deadbeef-0.4.3/plugins/gtkui/callbacks.c 2010-11-06 00:38:47.000000000 +0100 +@@ -715,7 +715,7 @@ + char s[200]; + snprintf (s, sizeof (s), _("DeaDBeeF %s ChangeLog"), VERSION); + char fname[PATH_MAX]; +- snprintf (fname, sizeof (fname), DOCDIR "/%s", "ChangeLog"); ++ snprintf (fname, sizeof (fname), DOCDIR "/%s", "changelog.deadbeef"); + show_info_window (fname, s, &changelogwindow); + } + --- deadbeef-0.4.3+dfsg.orig/debian/patches/debian_native_copying.patch +++ deadbeef-0.4.3+dfsg/debian/patches/debian_native_copying.patch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## PPA upstream patch +## DP: Correct the directory (GPL 2 & LGPL 2.1) +@DPATCH@ + +Index: deadbeef-0.4.3/plugins/gtkui/callbacks.c +=================================================================== +--- deadbeef-0.4.3.orig/plugins/gtkui/callbacks.c 2010-11-06 00:41:31.000000000 +0100 ++++ deadbeef-0.4.3/plugins/gtkui/callbacks.c 2010-11-06 00:41:38.000000000 +0100 +@@ -726,7 +726,7 @@ + gpointer user_data) + { + char fname[PATH_MAX]; +- snprintf (fname, sizeof (fname), DOCDIR "/%s", "COPYING.GPLv2"); ++ snprintf (fname, sizeof (fname), "/usr/share/common-licenses/GPL-2"); + show_info_window (fname, "GNU GENERAL PUBLIC LICENSE Version 2", &gplwindow); + } + +@@ -737,7 +737,7 @@ + gpointer user_data) + { + char fname[PATH_MAX]; +- snprintf (fname, sizeof (fname), DOCDIR "/%s", "COPYING.LGPLv2.1"); ++ snprintf (fname, sizeof (fname), "/usr/share/common-licenses/LGPL-2.1"); + show_info_window (fname, "GNU LESSER GENERAL PUBLIC LICENSE Version 2.1", &lgplwindow); + } + --- deadbeef-0.4.3+dfsg.orig/debian/patches/fix_po_missing.patch +++ deadbeef-0.4.3+dfsg/debian/patches/fix_po_missing.patch @@ -0,0 +1,8 @@ +Index: deadbeef-0.4.3/po/POTFILES.skip +=================================================================== +--- deadbeef-0.4.3.orig/po/POTFILES.skip 2010-11-10 22:45:51.000000000 +0100 ++++ deadbeef-0.4.3/po/POTFILES.skip 2010-11-10 22:46:03.000000000 +0100 +@@ -1 +1,3 @@ + plugins/vorbis/vcedit.c ++.pc/changelog_fix.patch/plugins/gtkui/callbacks.c ++.pc/debian_native_copying.patch/plugins/gtkui/callbacks.c --- deadbeef-0.4.3+dfsg.orig/debian/source/format +++ deadbeef-0.4.3+dfsg/debian/source/format @@ -0,0 +1 @@ +1.0