diff -Nru grip-3.3.1/debian/changelog grip-3.3.1/debian/changelog --- grip-3.3.1/debian/changelog 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/changelog 2013-04-08 10:11:37.000000000 +0000 @@ -1,557 +1,23 @@ -grip (3.3.1-16) unstable; urgency=low +grip (3.3.1-6) precise; urgency=low - * Reverting config.sub and config.guess to upstream. - * Removing watch file. - * Removing useless whitespaces from changelog. - * Upgrading package to debhelper 7. - * Upgrading package to standards 3.8.0. - * Adding vcs fields in control file. - * Updating build-depends. - * Rewriting copyright file in machine-interpretable format. - * Removed no longer usefull README.Debian. - * Reordering rules file. + * Add various random patches from sf.net - -- Daniel Baumann Sat, 8 Nov 2008 12:05:00 +0100 + -- Tim Booth Mon, 08 Apr 2013 11:10:57 +0100 -grip (3.3.1-15) unstable; urgency=low +grip (3.3.1-5) lucid; urgency=low - * Updating menu file to new policy. + * Remove dependency on lib32asound2. - -- Daniel Baumann Thu, 27 Dec 2007 12:25:00 +0100 + -- Marco Vermeulen Fri, 08 Apr 2011 01:13:39 +0100 -grip (3.3.1-14) unstable; urgency=low +grip (3.3.1-4) lucid; urgency=low - * Removing libghttp from build-depends (Closes: 455695). - * Bumping policy version. + * Added configurations for Musepack and Nero codecs. - -- Daniel Baumann Tue, 11 Dec 2007 10:23:00 +0100 + -- Marco Vermeulen Sat, 02 Apr 2011 16:19:48 +0100 -grip (3.3.1-13) unstable; urgency=low +grip (3.3.1-3) lucid; urgency=low - * Bumping package to debhelper 5. - * Fixing clean target in rules (Closes: #424374). + * Initial release - -- Daniel Baumann Sun, 17 Sep 2007 00:28:00 +0200 - -grip (3.3.1-12) unstable; urgency=medium - - * Added patch Frederic Bothamy to replace gnome - specific browser call with x-www-browser (Closes: #414277). - - -- Daniel Baumann Sat, 10 Mar 2007 16:51:00 +0100 - -grip (3.3.1-11) unstable; urgency=medium - - * Added patch from Adrian Cox to apply album gain - adjustment to the right album (Closes: #231886). - * Added patch from Matt Zimmerman to call executables in - path (Closes: #269596, #38447). - - -- Daniel Baumann Sun, 29 Oct 2006 15:58:00 +0100 - -grip (3.3.1-10) unstable; urgency=low - - * Added patch from Flavio Stanchina : - - Add encode configuration for AAC files (Closes: #279224). - - Add %N switch for the number of tracks (Closes: #310176). - - -- Daniel Baumann Fri, 29 Sep 2006 11:23:00 +0200 - -grip (3.3.1-9) unstable; urgency=low - - * Downgrading depends on yelp to a recommends to allow skipping the long - depends chain of yelp when it is not intended. - - -- Daniel Baumann Fri, 8 Sep 2006 20:25:00 +0200 - -grip (3.3.1-8) unstable; urgency=low - - * Updating 01-default-encoder.dpatch: - - passing track number to oggenc (Closes: #322738). - - using ~/ogg instead of ~/mp3 as output directory. - - removing useless 'Created by Grip' comment (Closes: #214723). - * Depending on yelp for the integrated help system (Closes: #278703, #324885). - - -- Daniel Baumann Mon, 14 Aug 2006 22:37:00 +0200 - -grip (3.3.1-7) unstable; urgency=low - - * Added 06-version.dpatch from Hidetaka Iwai to fix - buffer overflow if the translated string of "Version %s" is more than 20 - bytes (Closes: #382516). - - -- Daniel Baumann Fri, 28 Jul 2006 23:43:00 +0200 - -grip (3.3.1-6) unstable; urgency=low - - * New maintainer (Closes: #379984). - * Redone debian directory with debhelper instead of cdbs. - * Rewritten manpage. - * Rediffed all patches, updated descriptions and added bts numbers. - * Added pixmap (Closes: #162900) - * Added patch from Javier Fernandez-Sanguino Pena to - update Spanish translation (Closes: #354515). - - -- Daniel Baumann Fri, 11 Aug 2006 18:46:00 +0200 - -grip (3.3.1-5) unstable; urgency=low - - * Orphan package - - Change maintainer to Debian QA Group - * Fix dependency from "libcurl-ssl-dev" to - "libcurl3-gnutls-dev | libcurl-ssl-dev" - * Fix to build on GNU/kFreeBSD - (closes: #325321) - - -- Taku YASUI Thu, 27 Jul 2006 02:24:23 +0900 - -grip (3.3.1-4) unstable; urgency=low - - * fix ia64 segv - (closes: #318855) - - -- Taku YASUI Sat, 6 Aug 2005 03:03:01 +0900 - -grip (3.3.1-3) unstable; urgency=low - - * Rebuild for new C++ ABI - (closes: #321202) - - -- Taku YASUI Mon, 18 Jul 2005 07:59:28 +0900 - -grip (3.3.1-2) unstable; urgency=low - - * Add "autoconf" to Build-Deps: - (closes: #318358) - - -- Taku YASUI Mon, 18 Jul 2005 07:55:36 +0900 - -grip (3.3.1-1) unstable; urgency=low - - * New upstream release - (closes: #294899, #244390) - * remove unnessesory patch: 15_add_id3tag_only_mp3file.dpatch - (closes: #311225) - * remove unnessesory patch: 30_fix_bogus_http_proxy - * remove unnessesory patch: 02_configure - - I made 01_config patch to create configure script - - -- Taku YASUI Mon, 11 Jul 2005 00:27:55 +0900 - -grip (3.2.0-5) unstable; urgency=low - - * Add autotools-dev to Build-Deps. (Thanks to Andreas Jochens) - (closes: #299471) - - -- Taku YASUI Sat, 19 Mar 2005 01:41:19 +0900 - -grip (3.2.0-4) unstable; urgency=high - - * Fix cddb lookup buffer overflow (CAN-2005-0706) - (closes: #299248) - - -- Taku YASUI Mon, 14 Mar 2005 03:21:01 +0900 - -grip (3.2.0-3) unstable; urgency=low - - * Fix lintian warning about config.sub and config.guess - - -- Taku YASUI Mon, 16 Aug 2004 00:20:38 +0900 - -grip (3.2.0-2.1) unstable; urgency=medium - - * NMU. - * Closes: #263688: Please use gcrypt11/gnutls11 instead of gcrypt7/gnutls10 - - depend on libgnomeui-dev (>= 2.6.1.1-4) - - -- Matthias Urlichs Fri, 13 Aug 2004 10:04:38 +0200 - -grip (3.2.0-2) unstable; urgency=low - - * Add some document about filename encoding. If you want to use - filename encoding non-utf8, you should set G_FILENAME_ENCODING - environmental variable. Please read README.Debian. - (closes: #247976) - * Fix default oggenc commandline option. The genre is set correctly. - (closes: #259549) - * Fix bogus http proxy - (closes: #254233) - * Rebuild for libgnutls10 - (closes: #259334) - - -- Taku YASUI Sat, 17 Jul 2004 07:50:50 +0900 - -grip (3.2.0-1) unstable; urgency=low - - * New upstream release - (closes: #217787, #219388, #245823) - - -- Taku YASUI Wed, 12 May 2004 01:30:56 +0900 - -grip (3.1.10-1) unstable; urgency=low - - * New upstream release - (closes: #238418, #242311) - - -- Taku YASUI Sun, 25 Apr 2004 23:27:09 +0900 - -grip (3.1.8-1) unstable; urgency=low - - * New upstream release - (closes: #239846, #240402, #239903) - - -- Taku YASUI Sun, 28 Mar 2004 04:49:41 +0900 - -grip (3.1.7-1) unstable; urgency=low - - * New upstream release - (closes: #238418, #128018, #160220, #229459) - * Delete unnecessary patch: 20_change_oggenc_options.dpatch - It was implemented perfectly on upstream - - -- Taku YASUI Fri, 26 Mar 2004 00:22:17 +0900 - -grip (3.1.6-1) unstable; urgency=low - - * New upstream release - - -- Taku YASUI Sun, 14 Mar 2004 03:51:59 +0900 - -grip (3.1.5-1) unstable; urgency=low - - * New upstream release - * debian/rules cleanup by using cdbs and dpatch - - -- Taku YASUI Thu, 11 Mar 2004 14:33:31 +0900 - -grip (3.1.4-1) unstable; urgency=low - - * New upstream release - (closes: #218732) - - -- Taku YASUI Wed, 31 Dec 2003 00:00:42 +0900 - -grip (3.1.3-1) unstable; urgency=low - - * New upstream release - (closes: #219671) - * Add to GNOME2 menu - (closes: #219668) - - -- Taku YASUI Wed, 5 Nov 2003 21:09:19 +0900 - -grip (3.1.2-1) unstable; urgency=low - - * New upstream release - (closes: #214004) - - -- Taku YASUI Thu, 2 Oct 2003 13:31:01 +0900 - -grip (3.1.1-2) unstable; urgency=low - - * Change section from sound to gnome - - -- Taku YASUI Sat, 27 Sep 2003 16:46:21 +0900 - -grip (3.1.1-1) unstable; urgency=low - - * New upstream release - (closes: #187686) - * Fix Build-Deps - (closes: #212793) - - -- Taku YASUI Sat, 27 Sep 2003 15:03:14 +0900 - -grip (3.0.7-1) unstable; urgency=low - - * New upstream release - (closes: #155180) - * Fix: the disk filter doesn't work - (closes: #139145) - * Fix: empty .m3u files left around if "rip whole CD?" dialog - (closes: #179878) - * Re-construct package source tree - - -- Taku YASUI Sat, 21 Jun 2003 16:13:42 +0900 - -grip (3.0.6-1) unstable; urgency=low - - * New upstream release - * Add manpage grip.1 - * Replace config.guess and config.sub file to latest one - * Fix description - (closes: #187685) - * Fix build-deps - (closes: #181987) - - -- Taku YASUI Fri, 14 Feb 2003 18:06:30 +0900 - -grip (3.0.5-1) unstable; urgency=low - - * New upstream release - - -- Taku YASUI Mon, 13 Jan 2003 10:43:11 +0900 - -grip (3.0.4-1) unstable; urgency=low - - * New upstream release - - -- Taku YASUI Fri, 27 Dec 2002 12:20:42 +0900 - -grip (3.0.3-1) unstable; urgency=low - - * New upstream release - - -- Taku YASUI Thu, 26 Sep 2002 01:28:44 +0900 - -grip (3.0.2-1) unstable; urgency=low - - * New upstream release - - -- Taku YASUI Fri, 20 Sep 2002 02:27:37 +0900 - -grip (3.0.1-3) unstable; urgency=low - - * Change build dependency from libid3-dev to libid3-3.8.0-dev - (closes: #158421) - * Include track number in Ogg Vorbis comments - (closes: #155970) - * Add debian/watch file to scan new upstream releases - - -- Taku YASUI Wed, 28 Aug 2002 12:03:10 +0900 - -grip (3.0.1-2) unstable; urgency=low - - * Updated ja.po - (closes: #149028) - - -- Taku YASUI Mon, 15 Jul 2002 23:04:45 +0900 - -grip (3.0.1-1) unstable; urgency=low - - * New upstream release - - -- Taku YASUI Thu, 20 Jun 2002 02:07:31 +0900 - -grip (3.0.0-1) unstable; urgency=low - - * New upstream release - - -- Taku YASUI Mon, 15 Apr 2002 12:34:02 +0900 - -grip (2.99.3-1) unstable; urgency=low - - * New upstream release - (closes: #131494, #140449, #140450) - * Add additional switches for oggenc. - (closes: #135292) - * Fixed: blindly writes ID3 tags into Ogg files - (closes: #125733) - * Set default encoder oggenc. - (closes: #135113) - * Add bison and gettext to Build-Depends: field. - * Add vorbis-tools to Recommends: field. - - -- Taku YASUI Fri, 12 Apr 2002 02:37:37 +0900 - -grip (2.99.2-1) unstable; urgency=low - - * New upstream release - (closes: #138876) - - -- Taku YASUI Mon, 8 Apr 2002 09:26:34 +0900 - -grip (2.98.7-1) unstable; urgency=low - - * New upstream release - (closes: #69251, #110036) - * Fixed: devide-by-0 error on Alpha. - (closes: #127231, #131686) - * Add 'Suggests: gnome-help' to debian/control. - (closes: #131677) - * Add bitrate option for oggenc. - (closes: #87614, #128019, #132275) - - -- Taku YASUI Fri, 22 Feb 2002 00:58:43 +0900 - -grip (2.98.5-1) unstable; urgency=low - - * New upstream release - (closes: #42623, #50416, #79208, #97995, #100134, #105717, #109334, - #117952, #121182, #123260, #131189, #131353, #131479) - * Add libpopt-dev to Build-Depends: - (closes: #131050) - - -- Taku YASUI Wed, 30 Jan 2002 18:55:31 +0900 - -grip (2.98.4-1) unstable; urgency=low - - * New upstream release - (closes: #129874) - - -- Taku YASUI Sat, 26 Jan 2002 01:01:12 +0900 - -grip (2.96-4) unstable; urgency=low - - * Fixed: Track selection lost upon completion of cddb lookup - (closes: #109649) - - -- Taku YASUI Thu, 25 Oct 2001 01:12:48 +0900 - -grip (2.96-3) unstable; urgency=low - - * Fixed: dafault encoder path. - (closes: #91361) - - -- Taku YASUI Sun, 14 Oct 2001 13:22:18 +0900 - -grip (2.96-2) unstable; urgency=low - - * add default support for FLAC lossless encoder. - (fixed Bug#105717) - - -- Taku YASUI Mon, 23 Jul 2001 23:03:45 +0900 - -grip (2.96-1) unstable; urgency=low - - * New upstream release. - (closes: #105267, #92914) - - -- Taku YASUI Tue, 17 Jul 2001 19:21:05 +0900 - -grip (2.95-5) unstable; urgency=low - - * Maintainer is changed to Taku YASUI . - closes: #103093. - - -- Taku YASUI Mon, 2 Jul 2001 23:59:55 +0900 - -grip (2.95-4) unstable; urgency=low - - * Fixed a segfault when loading cddb info for a particular disc. - Patch provided by Matt Zimmerman . - closes: #88434. - * DEB_BUILD_OPTIONS: our CFLAGS aren't overridden by upstrem Makefile. - closes: #88433. - - -- Davide Puricelli (evo) Sun, 4 Mar 2001 18:34:36 +0100 - -grip (2.95-3) unstable; urgency=low - - * Fixed a mem leak caused by thread usage; closes: #78554. - * Removed "Created by Grip" from mp3info; closes: #69249. - - -- Davide Puricelli (evo) Tue, 19 Dec 2000 20:00:05 +0100 - -grip (2.95-2) unstable; urgency=low - - * Fixed grip.c to prevent a segfault; closes: #75395. - - -- Davide Puricelli (evo) Wed, 15 Nov 2000 19:18:00 +0100 - -grip (2.95-1) unstable; urgency=low - - * New upstream version. - (closes: #67683, #67688) - - * Standard compliant to 3.2.1 - - -- Davide Puricelli (evo) Thu, 19 Oct 2000 17:41:50 +0200 - -grip (2.94-1) unstable; urgency=low - - * New upstream version. - * Old bugs that we can safely close; closes: #48688, #48690, #35226, - #42598, #43006, #45780, #50061, #51460, #51461, #58901, #60813, #61275, - #63424, #47908, #63425, #63682. - - -- Davide Puricelli (evo) Wed, 4 Oct 2000 19:32:46 +0200 - -grip (2.91-2) unstable; urgency=low - - * New maintainer release. - - -- Davide Puricelli (evo) Tue, 3 Oct 2000 14:54:13 +0200 - -grip (2.91-1) unstable; urgency=low - - * New upstream version (Closes: #52560, #53538, #49622, #45476) - - -- Dima Barsky Mon, 03 Jan 2000 22:57:39 +0000 - -grip (2.7-2) unstable; urgency=low - - * Applied a patch from Brett Viren , - which fixes two buffer overflows in cddb.c (Closes: #40552) - - -- Dima Barsky Sat, 25 Sep 1999 01:36:44 +0100 - -grip (2.7-1) unstable; urgency=low - - * New upstream version (Closes: #39484, #40553, #40554, #43891, #44742) - - -- Dima Barsky Fri, 24 Sep 1999 20:29:42 +0100 - -grip (2.5-1) unstable; urgency=low - - * New upstream version (Closes: #41976) - * Split into grip and gcd - * grip now depends on libcdparanoia0 (Closes: #40784) - * Fixed the problem with va_start (Closes: #38947) - -- Dima Barsky Tue, 27 Jul 1999 22:32:47 +0000 - -grip (2.0-1) unstable; urgency=low - - * New upstream version - - -- Dima Barsky Fri, 28 May 1999 15:34:21 +0100 - -grip (1.9-1) unstable; urgency=low - - * New upstream version - * Grip now reads $HOME/.grip.cfg (if it is available), - otherwise /etc/grip.cfg. When saving the configuration, it tries - those files in the reversed order. Closes #33297, #36533 - * All configuration fields are now editable, because both setuid and - setgid bits are cleared during the installation, so there is no - security risk. Closes #34417 - - -- Dima Barsky Sat, 8 May 1999 22:04:12 +0100 - -grip (1.8-1) unstable; urgency=low - - * New upstream version - - -- Dima Barsky Tue, 6 Apr 1999 19:23:02 +0100 - -grip (1.7-1) unstable; urgency=low - - * New upstream version - - -- Dima Barsky Fri, 2 Apr 1999 13:06:41 +0100 - -grip (1.4-1) unstable; urgency=low - - * New upstream version - * Save grip.cfg in /etc rather than in /usr/lib/grip - Closes #34810 - - -- Dima Barsky Sat, 20 Mar 1999 00:29:13 +0000 - -grip (1.2-1) unstable; urgency=low - - * New upstream version - - -- Dima Barsky Sat, 27 Feb 1999 00:52:03 +0000 - -grip (1.1-1) unstable; urgency=low - - * New upstream version - - -- Dima Barsky Thu, 18 Feb 1999 23:39:28 +0000 - -grip (0.9-1) unstable; urgency=low - - * Initial Release. - - -- Dima Barsky Sun, 24 Jan 1999 19:59:16 +0000 + -- Marco Vermeulen Wed, 09 Mar 2011 23:16:52 +0000 diff -Nru grip-3.3.1/debian/control grip-3.3.1/debian/control --- grip-3.3.1/debian/control 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/control 2013-04-08 11:28:27.000000000 +0000 @@ -1,23 +1,31 @@ Source: grip -Section: gnome +Section: sound Priority: optional -Maintainer: Daniel Baumann -Build-Depends: debhelper (>= 7), dpatch, autotools-dev, autoconf, libcdparanoia0-dev, libcurl4-gnutls-dev, libglib2.0-dev, libgnome2-dev, libgnomeui-dev, libgtk2.0-dev, libid3-3.8.3-dev, libvte-dev -Standards-Version: 3.8.0 -Homepage: http://grip.sourceforge.net/ -Vcs-Browser: http://git.debian.net/?p=debian/grip.git -Vcs-Git: git://git.debian.net/git/debian/grip.git +Maintainer: Marco Vermeulen +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libgnomeui-dev, libvte-dev, libcurl4-openssl-dev +Standards-Version: 3.8.4 +Homepage: http://nostatic.org/grip Package: grip Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: vorbis-tools, yelp -Description: GNOME-based CD-player/ripper/encoder - Grip is a CD player and CD ripper/MP3-encoder for the GNOME desktop. It has - the ripping capabilities of cdparanoia built in, but can also use external - rippers (such as cdda2wav). It also provides an automated frontend for MP3 - encoders, letting you take a disc and transform it easily straight into MP3s. - The Ogg Vorbis format is also supported. The CDDB protocol is supported for - retrieving track information from disc database servers. Grip works with - DigitalDJ to provide a unified, "computerized" version of your music - collection. +Depends: ${shlibs:Depends}, ${misc:Depends}, gettext, file, libcroco3, libdbus-1-3, libgcrypt11, libkeyutils1, libmagic1, libexpat1, libgpg-error0, libunistring0, libasound2, cdparanoia, flac, lame, vorbis-tools, id3v2 +Description: CD-player and CD-ripper for the Gnome desktop + Grip is a cd-player and cd-ripper for the Gnome desktop. It has the ripping + capabilities of cdparanoia builtin, but can also use external rippers (such + as cdda2wav). It also provides an automated frontend for MP3 (and other audio + format) encoders, letting you take a disc and transform it easily straight + into MP3s. Internet disc lookups are supported for retrieving track + information from disc database servers.Grip works with DigitalDJ to provide a + unified "computerized" version of your music collection. + Full-featured CD player with a small screen footprint in "condensed" mode + . + * Database lookup/submission to share track information over the net + * HTTP proxy support for those behind firewalls + * Loop, shuffle, and playlist modes + * Ripping of single, multiple, or partial tracks + * Encoding of ripped .wav files into MP3 files (as well support for + OGG and FLAC) + * Simultaneous rip and encode + * Support for multiple encode processes on SMP machines + * Adding ID3v1/v2 tags to MP3 files + * Cooperating with DigitalDJ, my SQL-based MP3 jukebox diff -Nru grip-3.3.1/debian/copyright grip-3.3.1/debian/copyright --- grip-3.3.1/debian/copyright 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/copyright 2011-03-10 09:13:21.000000000 +0000 @@ -1,42 +1,364 @@ -Author: Mike Oliphant -Download: http://grip.sourceforge.net/ +This work was packaged for Debian by: -Files: * -Copyright: (C) 1998-2004 Mike Oliphant -License: GPL-2+ - 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 Street, 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-2 file. - -Files: debian/* -Copyright: (C) 2006-2008 Daniel Baumann -License: GPL-2+ - 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 Street, 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-2 file. + Marco Vermeulen on Wed, 09 Mar 2011 23:16:52 +0000 + +It was downloaded from: + + http://nostatic.org/grip + +Upstream Author(s): + + Mike Oliphant + +Copyright: + + + +License: + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public + License is intended to guarantee your freedom to share and change free + software--to make sure the software is free for all its users. This + General Public License applies to most of the Free Software + Foundation's software and to any other program whose authors commit to + using it. (Some other Free Software Foundation software is covered by + the GNU Library General Public License instead.) You can apply it to + your programs, too. + + When we speak of free software, we are referring to freedom, not + price. Our General Public Licenses are designed to make sure that you + have the freedom to distribute copies of free software (and charge for + this service if you wish), that you receive source code or can get it + if you want it, that you can change the software or use pieces of it + in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid + anyone to deny you these rights or to ask you to surrender the rights. + These restrictions translate to certain responsibilities for you if you + distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether + gratis or for a fee, you must give the recipients all the rights that + you have. You must make sure that they, too, receive or can get the + source code. And you must show them these terms so they know their + rights. + + We protect your rights with two steps: (1) copyright the software, and + (2) offer you this license which gives you legal permission to copy, + distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain + that everyone understands that there is no warranty for this free + software. If the software is modified by someone else and passed on, we + want its recipients to know that what they have is not the original, so + that any problems introduced by others will not reflect on the original + authors' reputations. + + Finally, any free program is threatened constantly by software + patents. We wish to avoid the danger that redistributors of a free + program will individually obtain patent licenses, in effect making the + program proprietary. To prevent this, we have made it clear that any + patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and + modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains + a notice placed by the copyright holder saying it may be distributed + under the terms of this General Public License. The "Program", below, + refers to any such program or work, and a "work based on the Program" + means either the Program or any derivative work under copyright law: + that is to say, a work containing the Program or a portion of it, + either verbatim or with modifications and/or translated into another + language. (Hereinafter, translation is included without limitation in + the term "modification".) Each licensee is addressed as "you". + + Activities other than copying, distribution and modification are not + covered by this License; they are outside its scope. The act of + running the Program is not restricted, and the output from the Program + is covered only if its contents constitute a work based on the + Program (independent of having been made by running the Program). + Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's + source code as you receive it, in any medium, provided that you + conspicuously and appropriately publish on each copy an appropriate + copyright notice and disclaimer of warranty; keep intact all the + notices that refer to this License and to the absence of any warranty; + and give any other recipients of the Program a copy of this License + along with the Program. + + You may charge a fee for the physical act of transferring a copy, and + you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion + of it, thus forming a work based on the Program, and copy and + distribute such modifications or work under the terms of Section 1 + above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Program, + and can be reasonably considered independent and separate works in + themselves, then this License, and its terms, do not apply to those + sections when you distribute them as separate works. But when you + distribute the same sections as part of a whole which is a work based + on the Program, the distribution of the whole must be on the terms of + this License, whose permissions for other licensees extend to the + entire whole, and thus to each and every part regardless of who wrote it. + + Thus, it is not the intent of this section to claim rights or contest + your rights to work written entirely by you; rather, the intent is to + exercise the right to control the distribution of derivative or + collective works based on the Program. + + In addition, mere aggregation of another work not based on the Program + with the Program (or with a work based on the Program) on a volume of + a storage or distribution medium does not bring the other work under + the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, + under Section 2) in object code or executable form under the terms of + Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + + The source code for a work means the preferred form of the work for + making modifications to it. For an executable work, complete source + code means all the source code for all modules it contains, plus any + associated interface definition files, plus the scripts used to + control compilation and installation of the executable. However, as a + special exception, the source code distributed need not include + anything that is normally distributed (in either source or binary + form) with the major components (compiler, kernel, and so on) of the + operating system on which the executable runs, unless that component + itself accompanies the executable. + + If distribution of executable or object code is made by offering + access to copy from a designated place, then offering equivalent + access to copy the source code from the same place counts as + distribution of the source code, even though third parties are not + compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program + except as expressly provided under this License. Any attempt + otherwise to copy, modify, sublicense or distribute the Program is + void, and will automatically terminate your rights under this License. + However, parties who have received copies, or rights, from you under + this License will not have their licenses terminated so long as such + parties remain in full compliance. + + 5. You are not required to accept this License, since you have not + signed it. However, nothing else grants you permission to modify or + distribute the Program or its derivative works. These actions are + prohibited by law if you do not accept this License. Therefore, by + modifying or distributing the Program (or any work based on the + Program), you indicate your acceptance of this License to do so, and + all its terms and conditions for copying, distributing or modifying + the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the + Program), the recipient automatically receives a license from the + original licensor to copy, distribute or modify the Program subject to + these terms and conditions. You may not impose any further + restrictions on the recipients' exercise of the rights granted herein. + You are not responsible for enforcing compliance by third parties to + this License. + + 7. If, as a consequence of a court judgment or allegation of patent + infringement or for any other reason (not limited to patent issues), + conditions are imposed on you (whether by court order, agreement or + otherwise) that contradict the conditions of this License, they do not + excuse you from the conditions of this License. If you cannot + distribute so as to satisfy simultaneously your obligations under this + License and any other pertinent obligations, then as a consequence you + may not distribute the Program at all. For example, if a patent + license would not permit royalty-free redistribution of the Program by + all those who receive copies directly or indirectly through you, then + the only way you could satisfy both it and this License would be to + refrain entirely from distribution of the Program. + + If any portion of this section is held invalid or unenforceable under + any particular circumstance, the balance of the section is intended to + apply and the section as a whole is intended to apply in other + circumstances. + + It is not the purpose of this section to induce you to infringe any + patents or other property right claims or to contest validity of any + such claims; this section has the sole purpose of protecting the + integrity of the free software distribution system, which is + implemented by public license practices. Many people have made + generous contributions to the wide range of software distributed + through that system in reliance on consistent application of that + system; it is up to the author/donor to decide if he or she is willing + to distribute software through any other system and a licensee cannot + impose that choice. + + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Program under this License + may add an explicit geographical distribution limitation excluding + those countries, so that distribution is permitted only in or among + countries not thus excluded. In such case, this License incorporates + the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions + of the General Public License from time to time. Such new versions will + be similar in spirit to the present version, but may differ in detail to + address new problems or concerns. + + Each version is given a distinguishing version number. If the Program + specifies a version number of this License which applies to it and "any + later version", you have the option of following the terms and conditions + either of that version or of any later version published by the Free + Software Foundation. If the Program does not specify a version number of + this License, you may choose any version ever published by the Free Software + Foundation. + + 10. If you wish to incorporate parts of the Program into other free + programs whose distribution conditions are different, write to the author + to ask for permission. For software which is copyrighted by the Free + Software Foundation, write to the Free Software Foundation; we sometimes + make exceptions for this. Our decision will be guided by the two goals + of preserving the free status of all derivatives of our free software and + of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY + FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN + OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES + PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED + OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS + TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE + PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, + REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING + WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR + REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, + INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING + OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED + TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY + YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER + PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it + free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest + to attach them to the start of each source file to most effectively + convey the exclusion of warranty; and each file should have at least + the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + 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., 675 Mass Ave, Cambridge, MA 02139, USA. + + Also add information on how to contact you by electronic and paper mail. + + If the program is interactive, make it output a short notice like this + when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + + The hypothetical commands `show w' and `show c' should show the appropriate + parts of the General Public License. Of course, the commands you use may + be called something other than `show w' and `show c'; they could even be + mouse-clicks or menu items--whatever suits your program. + + You should also get your employer (if you work as a programmer) or your + school, if any, to sign a "copyright disclaimer" for the program, if + necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + + This General Public License does not permit incorporating your program into + proprietary programs. If your program is a subroutine library, you may + consider it more useful to permit linking proprietary applications with the + library. If this is what you want to do, use the GNU Library General + Public License instead of this License. + +The Debian packaging is: + + Copyright (C) 2011 Marco Vermeulen + +and is licensed under the GPL version 3, +see "/usr/share/common-licenses/GPL-3". diff -Nru grip-3.3.1/debian/docs grip-3.3.1/debian/docs --- grip-3.3.1/debian/docs 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/docs 2011-03-09 23:17:28.000000000 +0000 @@ -1,3 +1,3 @@ -CREDITS +NEWS README TODO diff -Nru grip-3.3.1/debian/grip.1 grip-3.3.1/debian/grip.1 --- grip-3.3.1/debian/grip.1 1970-01-01 00:00:00.000000000 +0000 +++ grip-3.3.1/debian/grip.1 2011-03-10 15:51:52.000000000 +0000 @@ -0,0 +1,143 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH GNOME "1" "March 2011" "GNOME grip 3.3.1" "User Commands" +.SH NAME +GNOME \- manual page for GNOME grip 3.3.1 +.SH SYNOPSIS +.B grip +[\fIOPTION\fR...] +.SH DESCRIPTION +.TP +\fB\-\-load\-modules\fR=\fIMODULE1\fR,MODULE2,... +Dynamic modules to load +.PP +Help options +.TP +\-?, \fB\-\-help\fR +Show this help message +.TP +\fB\-\-usage\fR +Display brief usage message +.PP +Application options +.TP +\fB\-\-geometry\fR=\fIGEOMETRY\fR +Specify the geometry of the main +window +.TP +\fB\-\-config\fR=\fICONFIG\fR +Specify the config file to use +(in your home dir) +.TP +\fB\-\-device\fR=\fIDEVICE\fR +Specify the cdrom device to use +.TP +\fB\-\-scsi\-device\fR=\fIDEVICE\fR +Specify the generic scsi device +to use +.TP +\fB\-\-small\fR +Launch in "small" (cd\-only) mode +.TP +\fB\-\-local\fR +"Local" mode \fB\-\-\fR do not look up +disc info on the net +.TP +\fB\-\-no\-redirect\fR +Do not do I/O redirection +.TP +\fB\-\-verbose\fR +Run in verbose (debug) mode +.PP +GTK+ +.TP +\fB\-\-gdk\-debug\fR=\fIFLAGS\fR +Gdk debugging flags to set +.TP +\fB\-\-gdk\-no\-debug\fR=\fIFLAGS\fR +Gdk debugging flags to unset +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.TP +\fB\-\-screen\fR=\fISCREEN\fR +X screen to use +.TP +\fB\-\-sync\fR +Make X calls synchronous +.TP +\fB\-\-name\fR=\fINAME\fR +Program name as used by the +window manager +.TP +\fB\-\-class\fR=\fICLASS\fR +Program class as used by the +window manager +.TP +\fB\-\-gtk\-debug\fR=\fIFLAGS\fR +Gtk+ debugging flags to set +.TP +\fB\-\-gtk\-no\-debug\fR=\fIFLAGS\fR +Gtk+ debugging flags to unset +.TP +\fB\-\-g\-fatal\-warnings\fR +Make all warnings fatal +.TP +\fB\-\-gtk\-module\fR=\fIMODULE\fR +Load an additional Gtk module +.PP +Bonobo activation Support +.TP +\fB\-\-oaf\-ior\-fd\fR=\fIFD\fR +File descriptor to print IOR on +.TP +\fB\-\-oaf\-activate\-iid\fR=\fIIID\fR +IID to activate +.TP +\fB\-\-oaf\-private\fR +Prevent registering of server +with OAF +.PP +GNOME Library +.TP +\fB\-\-disable\-sound\fR +Disable sound server usage +.TP +\fB\-\-enable\-sound\fR +Enable sound server usage +.TP +\fB\-\-espeaker\fR=\fIHOSTNAME\fR:PORT +Host:port on which the sound +server to use is running +.TP +\fB\-\-version\fR +2.32.0 +.PP +Session management +.TP +\fB\-\-sm\-client\-id\fR=\fIID\fR +Specify session management ID +.TP +\fB\-\-sm\-config\-prefix\fR=\fIPREFIX\fR +Specify prefix of saved +configuration +.TP +\fB\-\-sm\-disable\fR +Disable connection to session +manager +.PP +GNOME GUI Library +.TP +\fB\-\-disable\-crash\-dialog\fR +Disable Crash Dialog +.SH "SEE ALSO" +The full documentation for +.B GNOME +is maintained as a Texinfo manual. If the +.B info +and +.B GNOME +programs are properly installed at your site, the command +.IP +.B info GNOME +.PP +should give you access to the complete manual. diff -Nru grip-3.3.1/debian/grip.manpages grip-3.3.1/debian/grip.manpages --- grip-3.3.1/debian/grip.manpages 1970-01-01 00:00:00.000000000 +0000 +++ grip-3.3.1/debian/grip.manpages 2011-03-10 16:04:11.000000000 +0000 @@ -0,0 +1 @@ +debian/grip.1 diff -Nru grip-3.3.1/debian/install grip-3.3.1/debian/install --- grip-3.3.1/debian/install 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/pixmaps/* /usr/share/pixmaps/ diff -Nru grip-3.3.1/debian/manpage/grip.1 grip-3.3.1/debian/manpage/grip.1 --- grip-3.3.1/debian/manpage/grip.1 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/manpage/grip.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,176 +0,0 @@ -.TH GRIP 1 "2006-07-29" "3.3.1" "Gtk Applications" - -.SH NAME -grip \- A gtk-based cd-player and cd-ripper - -.SH SYNOPSIS -.B grip -.RB [\| \-\-class=CLASS \|] -.RB [\| \-\-config=CONFIG \|] -.RB [\| \-\-device=DEVICE \|] -.RB [\| \-\-display=DISPLAY \|] -.RB [\| \-\-disable-crash-dialog \|] -.RB [\| \-\-disable-sound \|] -.RB [\| \-\-enable-sound \|] -.RB [\| \-\-espeaker=HOSTNAME:PORT \|] -.RB [\| \-\-g-fatal-warnings \|] -.RB [\| \-\-gdk-debug=FLAGS \|] -.RB [\| \-\-gdk-no-debug=FLAGS \|] -.RB [\| \-\-gtk-debug=FLAGS \|] -.RB [\| \-\-gtk-no-debug=FLAGS \|] -.RB [\| \-\-gtk-module=MODULE \|] -.RB [\| \-\-geometry=GEOMETRY \|] -.RB [\| \-\-load-modules=MODULE1,MODULE2,... \|] -.RB [\| \-\-local \|] -.RB [\| \-\-name=NAME \|] -.RB [\| \-\-no-redirect \|] -.RB [\| \-\-oaf-ior-fd=FD \|] -.RB [\| \-\-oaf-activate-iid=IID \|] -.RB [\| \-\-oaf-private \|] -.RB [\| \-\-screen=SCREEN \|] -.RB [\| \-\-scsi-device=DEVICE \|] -.RB [\| \-\-sm-client-id=ID \|] -.RB [\| \-\-sm-disable \|] -.RB [\| \-\-sm-config-prefix=PREFIX \|] -.RB [\| \-\-small \|] -.RB [\| \-\-sync \|] -.RB [\| \-\-verbose \|] -.RB [\| \-\-version \|] -.PP -.B grip -.RB [\| \-? \||\| \-\-help \|] -.PP -.B grip -.RB [\| \-\-usage \|] - -.SH DESCRIPTION -.B grip -is a CD player and CD ripper/MP3-encoder for the GNOME desktop. It has the ripping capabilities of cdparanoia built in, but can also use external rippers (such as cdda2wav). It also provides an automated frontend for MP3 encoders, letting you take a disc and transform it easily straight into MP3s. The Ogg Vorbis format is also supported. The CDDB protocol is supported for retrieving track information from disc database servers. Grip works with DigitalDJ to provide a unified, "computerized" version of your music collection. - -.SH OPTIONS -.PP - -Application options: -.TP -.B \-\-geometry=GEOMETRY -Specify the geometry of the main window. -.TP -.B \-\-config=CONFIG -Specify the config file to use (in your home dir). -.TP -.B \-\-device=DEVICE -Specify the cdrom device to use. -.TP -.B \-\-scsi-device=DEVICE -Specify the generic scsi device to use. -.TP -.B \-\-small -Launch in "small" (cd-only) mode. -.TP -.B \-\-local -"Local" mode \- do not look up disc info on the net. -.TP -.B \-\-no-redirect -Do not do I/O redirection. -.TP -.B \-\-verbose -Run in verbose (debug) mode. -.PP - -GTK+ options: -.TP -.B \-\-gdk-debug=FLAGS -Gdk debugging flags to set. -.TP -.B \-\-gdk-no-debug=FLAGS -Gdk debugging flags to unset. -.TP -.B \-\-display=DISPLAY -X display to use. -.TP -.B \-\-screen=SCREEN -X screen to use. -.TP -.B \-\-sync -Make X calls synchronous. -.TP -.B \-\-name=NAME -Program name as used by the window manager. -.TP -.B \-\-class=CLASS -Program class as used by the window manager. -.TP -.B \-\-gtk-debug=FLAGS -Gtk+ debugging flags to set. -.TP -.B \-\-gtk-no-debug=FLAGS -Gtk+ debugging flags to unset. -.TP -.B \-\-g-fatal-warnings -Make all warnings fatal. -.TP -.B \-\-gtk-module=MODULE -Load an additional Gtk module. -.PP - -Bonobo activation Support options: -.TP -.B \-\-oaf-ior-fd=FD -File descriptor to print IOR on. -.TP -.B \-\-oaf-activate-iid=IID -IID to activate. -.TP -.B \-\-oaf-private -Prevent registering of server with OAF. -.PP - -GNOME Library options: -.TP -.B \-\-disable-sound -Disable sound server usage. -.TP -.B \-\-enable-sound -Enable sound server usage. -.TP -.B \-\-espeaker=HOSTNAME:PORT -Host:port on which the sound server to use is running. -.TP -.B \-\-version -2.14.1 -.PP - -Session management options: -.TP -.B \-\-sm-client-id=ID -Specify session management ID. -.TP -.B \-\-sm-config-prefix=PREFIX -Specify prefix of saved configuration. -.TP -.B \-\-sm-disable -Disable connection to session manager. -.PP - -GNOME GUI Library options: -.TP -.B \-\-disable-crash-dialog -Disable Crash Dialog. -.PP - -Help options: -.TP -.B \-?, \-\-help -Show this help message. -.TP -.B \-\-usage -Display brief usage message. - -.SH SEE ALSO -.BR GNOME Help -Start grip and select Help. - -.SH AUTHOR -grip was written by Mike Oliphant . -.PP -This manual page was written by Daniel Baumann , for the Debian project (but may be used by others). diff -Nru grip-3.3.1/debian/manpages grip-3.3.1/debian/manpages --- grip-3.3.1/debian/manpages 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/manpage/* diff -Nru grip-3.3.1/debian/menu grip-3.3.1/debian/menu --- grip-3.3.1/debian/menu 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -?package(grip):needs="X11" section="Applications/Sound"\ - title="Grip" longtitle="CD-player/ripper/encoder"\ - command="/usr/bin/grip" icon="/usr/share/pixmaps/grip.xpm" diff -Nru grip-3.3.1/debian/patches/00list grip-3.3.1/debian/patches/00list --- grip-3.3.1/debian/patches/00list 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -01-default-encoder.dpatch -02-empty-m3u.dpatch -03-ia64.dpatch -04-kfreebsd.dpatch -05-i18n-es.dpatch -06-version.dpatch -07-faac-aac.dpatch -08-track-number.dpatch -09-gain-adjustment.dpatch -10-executable-path.dpatch -11-x-www-browser.dpatch diff -Nru grip-3.3.1/debian/patches/01-default-encoder.dpatch grip-3.3.1/debian/patches/01-default-encoder.dpatch --- grip-3.3.1/debian/patches/01-default-encoder.dpatch 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/patches/01-default-encoder.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 01-default-encoder.dpatch by Taku Yasui -## -## DP: Set default encoder oggenc. (closes: #135113) -## DP: Passes track number to oggent (Closes #322738). -## DP: Using ~/ogg instead of ~/mp3 as output directory. -## DP: Removes useless 'Created by Grip' comment (Closes: #214723). - -@DPATCH@ - -diff -Naur grip-3.3.1.orig/src/grip.c grip-3.3.1/src/grip.c ---- grip-3.3.1.orig/src/grip.c 2005-06-25 18:00:55.000000000 +0000 -+++ grip-3.3.1/src/grip.c 2006-08-14 22:09:38.000000000 +0000 -@@ -862,7 +862,7 @@ - ginfo->using_builtin_cdp=FALSE; - #endif - ginfo->in_rip_thread=FALSE; -- strcpy(ginfo->ripfileformat,"~/mp3/%A/%d/%n.wav"); -+ strcpy(ginfo->ripfileformat,"~/ogg/%A/%d/%n.wav"); - #ifdef __linux__ - FindExeInPath("cdparanoia", ginfo->ripexename, sizeof(ginfo->ripexename)); - strcpy(ginfo->ripcmdline,"-d %c %t:[.%s]-%t:[.%e] %w"); -@@ -885,24 +885,24 @@ - ginfo->stop_between_tracks=FALSE; - *ginfo->wav_filter_cmd='\0'; - *ginfo->disc_filter_cmd='\0'; -- ginfo->selected_encoder=1; -- strcpy(ginfo->mp3cmdline,"-h -b %b %w %m"); -- FindExeInPath("lame", ginfo->mp3exename, sizeof(ginfo->mp3exename)); -- strcpy(ginfo->mp3fileformat,"~/mp3/%A/%d/%n.%x"); -- strcpy(ginfo->mp3extension,"mp3"); -+ ginfo->selected_encoder=6; -+ strcpy(ginfo->mp3cmdline,"-a %a -b %b -d %y -G %g -N %t -l %d -o %m -t %n %w"); -+ FindExeInPath("oggenc", ginfo->mp3exename, sizeof(ginfo->mp3exename)); -+ strcpy(ginfo->mp3fileformat,"~/ogg/%A/%d/%n.%x"); -+ strcpy(ginfo->mp3extension,"ogg"); - ginfo->mp3nice=0; - *ginfo->mp3_filter_cmd='\0'; - ginfo->delete_wavs=TRUE; - ginfo->add_to_db=FALSE; - ginfo->add_m3u=TRUE; - ginfo->rel_m3u=TRUE; -- strcpy(ginfo->m3ufileformat,"~/mp3/%A-%d.m3u"); -+ strcpy(ginfo->m3ufileformat,"~/ogg/%A-%d.m3u"); - ginfo->kbits_per_sec=128; - ginfo->edit_num_cpu=1; - ginfo->doid3=TRUE; - ginfo->doid3=FALSE; - ginfo->tag_mp3_only=TRUE; -- strcpy(ginfo->id3_comment,_("Created by Grip")); -+ strcpy(ginfo->id3_comment,_("")); - *ginfo->cdupdate='\0'; - ginfo->sprefs.no_lower_case=FALSE; - ginfo->sprefs.allow_high_bits=FALSE; diff -Nru grip-3.3.1/debian/patches/02-empty-m3u.dpatch grip-3.3.1/debian/patches/02-empty-m3u.dpatch --- grip-3.3.1/debian/patches/02-empty-m3u.dpatch 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/patches/02-empty-m3u.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 02-empty-m3u.dpatch by Taku YASUI -## -## DP: Fix: empty .m3u files left around if "rip whole CD?" dialog -## DP: (closes: #179878) - -@DPATCH@ - -diff -Naur grip-3.3.1.orig/src/rip.c grip-3.3.1/src/rip.c ---- grip-3.3.1.orig/src/rip.c 2005-06-25 18:00:55.000000000 +0000 -+++ grip-3.3.1/src/rip.c 2006-07-29 08:02:31.000000000 +0000 -@@ -636,6 +636,31 @@ - return TRUE; - } - -+void RemoveM3U(GripInfo *ginfo) -+{ -+ FILE *fp; -+ EncodeTrack enc_track; -+ char testchar; -+ GString *str; -+ -+ if (!ginfo->have_disc) return; -+ -+ str=g_string_new(NULL); -+ -+ FillInTrackInfo(ginfo, 0, &enc_track); -+ TranslateString(ginfo->m3ufileformat, str, TranslateSwitch, -+ &enc_track, TRUE, &(ginfo->sprefs)); -+ -+ fp=fopen(str->str, "r"); -+ if (fp==NULL) -+ return; -+ testchar = fgetc(fp); -+ fclose(fp); -+ if (testchar == EOF) -+ remove(str->str); -+ return; -+} -+ - void KillRip(GtkWidget *widget,gpointer data) - { - GripInfo *ginfo; -@@ -1341,7 +1366,10 @@ - int track; - GripInfo *ginfo; - -- if(reply) return; -+ if(reply) { -+ RemoveM3U((GripInfo *) data); -+ return; -+ } - - Debug(_("Ripping whole CD\n")); - diff -Nru grip-3.3.1/debian/patches/03-ia64.dpatch grip-3.3.1/debian/patches/03-ia64.dpatch --- grip-3.3.1/debian/patches/03-ia64.dpatch 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/patches/03-ia64.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 03-ia64.dpatch by Dann Frazier -## -## DP: fix ia64 segv (closes: #318855) - -@DPATCH@ - -diff -Naur grip-3.3.1.orig/src/tray.c grip-3.3.1/src/tray.c ---- grip-3.3.1.orig/src/tray.c 2005-01-29 18:34:17.000000000 +0000 -+++ grip-3.3.1/src/tray.c 2006-07-29 08:03:29.000000000 +0000 -@@ -21,6 +21,7 @@ - */ - - #include "tray.h" -+#include "uihelper.h" - #include "../pixmaps/rip1.xpm" - #include "../pixmaps/menuplay.xpm" - #include "../pixmaps/menupause.xpm" -diff -Naur grip-3.3.1.orig/src/uihelper.h grip-3.3.1/src/uihelper.h ---- grip-3.3.1.orig/src/uihelper.h 1970-01-01 00:00:00.000000000 +0000 -+++ grip-3.3.1/src/uihelper.h 2006-07-29 08:03:29.000000000 +0000 -@@ -0,0 +1,30 @@ -+/* uihelper.h -+ * -+ * Copyright (c) 2005 dann frazier -+ * -+ * http://www.nostatic.org/grip -+ * -+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -+ * USA -+ */ -+ -+#ifndef GRIP_UIHELPER_H -+#define GRIP_UIHELPER_H -+ -+GtkWidget *Loadxpm(GtkWidget *widget,char **xpm); -+GtkWidget *BuildMenuItemXpm(GtkWidget *xpm, gchar *text); -+GtkWidget *BuildMenuItem(gchar *impath, gchar *text, gboolean stock); -+ -+#endif diff -Nru grip-3.3.1/debian/patches/04-kfreebsd.dpatch grip-3.3.1/debian/patches/04-kfreebsd.dpatch --- grip-3.3.1/debian/patches/04-kfreebsd.dpatch 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/patches/04-kfreebsd.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 04-kfreebsd.dpatch by Aurelien Jarno -## -## DP: Fix to build on GNU/kFreeBSD (closes: #325321 - -@DPATCH@ - -diff -Naur grip-3.3.1.orig/src/grip.h grip-3.3.1/src/grip.h ---- grip-3.3.1.orig/src/grip.h 2005-01-29 18:34:17.000000000 +0000 -+++ grip-3.3.1/src/grip.h 2006-07-29 08:04:13.000000000 +0000 -@@ -49,7 +49,7 @@ - - #define RRand(range) (random()%(range)) - --#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__osf__) /* __osf__ ?? */ -+#if defined(__linux__) || defined(__FreeBSD__) || defined(__GLIBC__) || defined(__NetBSD__) || defined(__osf__) /* __osf__ ?? */ - - #define MAILER "/usr/sbin/sendmail -i -t" - diff -Nru grip-3.3.1/debian/patches/05-i18n-es.dpatch grip-3.3.1/debian/patches/05-i18n-es.dpatch --- grip-3.3.1/debian/patches/05-i18n-es.dpatch 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/patches/05-i18n-es.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,1114 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 05-i18n-es.dpatch by Javier Fernandez-Sanguino -## -## DP: Update to the spanish translation (typoes and other stuff) -## DP: (Closes: #354515) - -@DPATCH@ - -diff -Naur grip-3.3.1.orig/po/es.po grip-3.3.1/po/es.po ---- grip-3.3.1.orig/po/es.po 2005-06-25 18:49:43.000000000 +0000 -+++ grip-3.3.1/po/es.po 2006-07-29 08:24:03.000000000 +0000 -@@ -2,17 +2,20 @@ - # Copyright (C) 2002 Free Software Foundation, Inc. - # El_Pavo_Asesino , 2002 - # --#, fuzzy -+# Actualización y revisión: -+# -+# Javier Fernandez-Sanguino , 2006 -+# - msgid "" - msgstr "" --"Project-Id-Version: grip-3.0.0\n" -+"Project-Id-Version: grip-3.3.1\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-06-25 11:23-0700\n" --"PO-Revision-Date: 2002-05-24 15:40-006\n" --"Last-Translator: El_Pavo_Asesino \n" --"Language-Team: ESPAÑOL \n" -+"PO-Revision-Date: 2006-02-27 01:11+0100\n" -+"Last-Translator: Javier Fernández-Sanguino \n" -+"Language-Team: Grupo de traducción al español \n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=\n" -+"Content-Type: text/plain; charset=iso-8859-1\n" - "Content-Transfer-Encoding: 8bit\n" - - #: src/main.c:56 -@@ -25,11 +28,11 @@ - - #: src/main.c:65 - msgid "Specify the config file to use (in your home dir)" --msgstr "" -+msgstr "Especifique el archivo de configuración a utilizar (en su directorio personal)" - - #: src/main.c:66 - msgid "CONFIG" --msgstr "" -+msgstr "CONFIG" - - #: src/main.c:74 - msgid "Specify the cdrom device to use" -@@ -45,11 +48,11 @@ - - #: src/main.c:92 - msgid "Launch in \"small\" (cd-only) mode" --msgstr "Lanzar en modo \"small\" (sólo el cdrom)" -+msgstr "Lanzar en modo reducido (sólo el cdrom)" - - #: src/main.c:101 - msgid "\"Local\" mode -- do not look up disc info on the net" --msgstr "Modo \"local\" -- no buscar la informacion del disco en la red" -+msgstr "Modo «local» -- no buscar la informacion del disco en la red" - - #: src/main.c:110 - msgid "Do not do I/O redirection" -@@ -66,17 +69,17 @@ - #: src/grip.c:238 - #, c-format - msgid "Error: Unable to initialize [%s]\n" --msgstr "Error: No pude inicializar [%s]\n" -+msgstr "Error: No se pudo inicializar [%s]\n" - - #: src/grip.c:324 - msgid "" - "This is a development version of Grip. If you encounter problems, you are " - "encouraged to revert to the latest stable version." --msgstr "" -+msgstr "Esta es una versión de desarrollo de Gripo. Se le recomienda utilizar la última versión estable si se encuentra con problemas." - - #: src/grip.c:330 - msgid "Grip started successfully\n" --msgstr "" -+msgstr "Grip arrancó con éxito\n" - - #: src/grip.c:344 - msgid "" -@@ -87,13 +90,12 @@ - "¿Reálmente quieres cerrar?" - - #: src/grip.c:395 --#, fuzzy - msgid "Status" --msgstr "Estado de la extracción" -+msgstr "Estado" - - #: src/grip.c:410 - msgid "General" --msgstr "" -+msgstr "General" - - #: src/grip.c:425 src/gripcfg.c:362 src/cdplay.c:251 src/cdplay.c:345 - #: src/rip.c:95 -@@ -101,9 +103,8 @@ - msgstr "Extraer" - - #: src/grip.c:440 src/gripcfg.c:496 --#, fuzzy - msgid "Encode" --msgstr "Codificador" -+msgstr "Codificar" - - #: src/grip.c:485 - msgid "Help" -@@ -144,32 +145,30 @@ - #: src/grip.c:565 - #, c-format - msgid "Version %s" --msgstr "" -+msgstr "Versión %s" - - #: src/grip.c:905 - msgid "Created by Grip" --msgstr "" -+msgstr "Creado por Grip" - - #: src/grip.c:922 --#, fuzzy - msgid "" - "Your config file is out of date -- resetting to defaults.\n" - "You will need to re-configure Grip.\n" - "Your old config file has been saved with -old appended." - msgstr "" --"Tu archivo de configuración es muy antiguo -- tomaré valores por defecto.\n" --"Necesitarás reconfigurar Grip\n" --"Tu archivo viejo de configuración ha sido guardado en ~/.grip-old." -+"Tu archivo de configuración es muy antiguo, se establecerán los valores por omisiión.\n" -+"Necesitará reconfigurar Grip\n" -+"Se ha guardado su archivo de configuración antiguo añadiéndole un -old." - - #: src/grip.c:995 - #, c-format - msgid "server is %s, port %d\n" --msgstr "Servidor: %s, puerto: %d\n" -+msgstr "El servidor es %s, puerto: %d\n" - - #: src/grip.c:1016 --#, fuzzy - msgid "Error: Unable to save config file." --msgstr "Error: No pude guardar el archivo de configuración" -+msgstr "Error: No pude guardar el archivo de configuración." - - #: src/gripcfg.c:105 - msgid "Config" -@@ -205,11 +204,11 @@ - - #: src/gripcfg.c:147 - msgid "Poll disc drive for new disc" --msgstr "" -+msgstr "Consultar a la unidad de disco si hay discos nuevos" - - #: src/gripcfg.c:151 - msgid "Poll interval (seconds)" --msgstr "" -+msgstr "Intervalo de consulta (segundos)" - - #: src/gripcfg.c:159 - msgid "CD" -@@ -217,7 +216,7 @@ - - #: src/gripcfg.c:175 - msgid "Ripper:" --msgstr "Extractor" -+msgstr "Extractor:" - - #: src/gripcfg.c:220 - msgid "Ripping executable" -@@ -225,7 +224,7 @@ - - #: src/gripcfg.c:225 - msgid "Rip command-line" --msgstr "Línea de comandos para extraer" -+msgstr "Línea de órdenes para extraer" - - #: src/gripcfg.c:236 - msgid "Disable paranoia" -@@ -265,11 +264,11 @@ - - #: src/gripcfg.c:292 - msgid "Rip 'nice' value" --msgstr "Valor 'nice' del extractor" -+msgstr "Valor «nice» del extractor" - - #: src/gripcfg.c:296 - msgid "Max non-encoded .wav's" --msgstr "No. máximo de .wav sin codificar" -+msgstr "Nº máximo de .wav sin codificar" - - #: src/gripcfg.c:302 - msgid "Auto-rip on insert" -@@ -277,7 +276,7 @@ - - #: src/gripcfg.c:306 - msgid "Beep after rip" --msgstr "Hacer Beep al terminar de extraer" -+msgstr "Hacer «beep» al terminar de extraer" - - #: src/gripcfg.c:316 - msgid "Auto-eject after rip" -@@ -289,23 +288,23 @@ - - #: src/gripcfg.c:328 - msgid "Delay before ripping" --msgstr "" -+msgstr "Retardo antes de extraer" - - #: src/gripcfg.c:333 - msgid "Delay encoding until disc is ripped" --msgstr "" -+msgstr "Retraso en la codificación hasta que el disco se extraiga" - - #: src/gripcfg.c:338 - msgid "Stop cdrom drive between tracks" --msgstr "" -+msgstr "Parar la unidad de CDROM entre pistas" - - #: src/gripcfg.c:342 - msgid "Wav filter command" --msgstr "Comando de filtro Wav" -+msgstr "Orden de filtro Wav" - - #: src/gripcfg.c:347 - msgid "Disc filter command" --msgstr "Comando de filtro de disco" -+msgstr "Orden de filtro de disco" - - #: src/gripcfg.c:355 src/gripcfg.c:489 - msgid "Options" -@@ -316,24 +315,20 @@ - msgstr "Codificar" - - #: src/gripcfg.c:412 --#, fuzzy - msgid "Encoder executable" --msgstr "Ejecutable Mp3" -+msgstr "Ejecutable de codificación" - - #: src/gripcfg.c:417 --#, fuzzy - msgid "Encoder command-line" --msgstr "Línea de comandos para extraer" -+msgstr "Línea de órdenes para el codificador" - - #: src/gripcfg.c:423 --#, fuzzy - msgid "Encode file extension" --msgstr "Formato de archivo de extracción" -+msgstr "Extensión del archivo codificado" - - #: src/gripcfg.c:428 --#, fuzzy - msgid "Encode file format" --msgstr "Formato de archivo de extracción" -+msgstr "Formato de archivo codificado" - - #: src/gripcfg.c:436 - msgid "Encoder" -@@ -361,35 +356,31 @@ - - #: src/gripcfg.c:469 - msgid "Encoding bitrate (kbits/sec)" --msgstr "Bitrate de codificación (kbits/seg)" -+msgstr "Tasa de bits de codificación (kbits/seg)" - - #: src/gripcfg.c:473 - msgid "Number of CPUs to use" - msgstr "Número de CPUs a usar" - - #: src/gripcfg.c:477 --#, fuzzy - msgid "Encode 'nice' value" --msgstr "Valor 'nice' del extractor" -+msgstr "Valor «nice» del codificador" - - #: src/gripcfg.c:481 --#, fuzzy - msgid "Encode filter command" --msgstr "Comando de filtro de disco" -+msgstr "Orden de filtro de codificación" - - #: src/gripcfg.c:505 --#, fuzzy - msgid "Add ID3 tags to encoded files" --msgstr "Añadir etiquetas ID3 a los archivos MP3" -+msgstr "Añadir etiquetas ID3 a los archivos codificados" - - #: src/gripcfg.c:511 --#, fuzzy - msgid "Add ID3v2 tags to encoded files" --msgstr "Añadir etiquetas ID3v2 a los archivos MP3" -+msgstr "Añadir etiquetas ID3v2 a los archivos codificados" - - #: src/gripcfg.c:517 - msgid "Only tag files ending in '.mp3'" --msgstr "" -+msgstr "Sólo marcar archivos que terminan en «.mp3»" - - #: src/gripcfg.c:521 - msgid "ID3 comment field" -@@ -397,12 +388,11 @@ - - #: src/gripcfg.c:526 - msgid "ID3v1 Character set encoding" --msgstr "" -+msgstr "Codificación dek conjunto de caracteres ID3v1" - - #: src/gripcfg.c:532 --#, fuzzy - msgid "ID3v2 Character set encoding" --msgstr "Borrar .wav despues de codificar" -+msgstr "Codificación del conjunto de caracteres ID3v2" - - #: src/gripcfg.c:540 - msgid "ID3" -@@ -410,28 +400,27 @@ - - #: src/gripcfg.c:557 src/gripcfg.c:577 - msgid "DB server" --msgstr "Servidor BD" -+msgstr "Servidor BBDD" - - #: src/gripcfg.c:561 src/gripcfg.c:581 - msgid "CGI path" --msgstr "Camino a CGI" -+msgstr "Ruta al CGI" - - #: src/gripcfg.c:568 - msgid "Primary Server" --msgstr "Servidor Primario" -+msgstr "Servidor primario" - - #: src/gripcfg.c:588 - msgid "Secondary Server" --msgstr "Servidor Secundario" -+msgstr "Servidor secundario" - - #: src/gripcfg.c:598 - msgid "DB Submit email" - msgstr "Correo-e para mandar a a la BD" - - #: src/gripcfg.c:603 --#, fuzzy - msgid "DB Character set encoding" --msgstr "Borrar .wav despues de codificar" -+msgstr "Conjunto de caracteres para codificación de BBDD" - - #: src/gripcfg.c:608 - msgid "Use freedb extensions" -@@ -443,7 +432,7 @@ - - #: src/gripcfg.c:621 - msgid "DiscDB" --msgstr "" -+msgstr "DiscDB" - - #: src/gripcfg.c:630 - msgid "Use proxy server" -@@ -451,19 +440,19 @@ - - #: src/gripcfg.c:637 - msgid "Get server from 'http_proxy' env. var" --msgstr "Obtener el servidor desde la variable de entorno 'http-proxy'" -+msgstr "Obtener el servidor desde la variable de entorno «http-proxy»" - - #: src/gripcfg.c:641 - msgid "Proxy server" --msgstr "Servidor Proxy" -+msgstr "Servidor proxy" - - #: src/gripcfg.c:645 - msgid "Proxy port" --msgstr "Puerto Proxy" -+msgstr "Puerto del proxy" - - #: src/gripcfg.c:649 - msgid "Proxy username" --msgstr "nombre de usuario Proxy" -+msgstr "Nombre de usuario para el proxy" - - #: src/gripcfg.c:655 - msgid "Proxy password" -@@ -471,11 +460,11 @@ - - #: src/gripcfg.c:663 - msgid "Proxy" --msgstr "" -+msgstr "Proxy" - - #: src/gripcfg.c:672 - msgid "Email address" --msgstr "Direccion de correo" -+msgstr "Direccion de correo-e" - - #: src/gripcfg.c:676 - msgid "CD update program" -@@ -491,7 +480,7 @@ - - #: src/gripcfg.c:691 - msgid "Replace incompatible characters by hexadecimal numbers" --msgstr "" -+msgstr "Reemplazar caracteres incompatibles por números hexadecimales" - - #: src/gripcfg.c:696 - msgid "Do not change spaces to underscores" -@@ -502,31 +491,30 @@ - "Characters to not strip\n" - "in filenames" - msgstr "" --"Caractéres que no se deben Strip?\n" --" en los nombres de archivo" -+"Caracteres que no se deben quitar\n" -+"de los nombres de archivo" - - #: src/gripcfg.c:706 -+#, fuzzy - msgid "Show tray icon" --msgstr "" -+msgstr "Mostrar icono " - - #: src/gripcfg.c:713 - msgid "Misc" --msgstr "" -+msgstr "Misc." - - #: src/gripcfg.c:819 --#, fuzzy - msgid "Error: Unable to save ripper config." --msgstr "Error: No pude guardar el archivo de configuración" -+msgstr "Error: No pude guardar la configuración del extractor." - - #: src/gripcfg.c:890 --#, fuzzy - msgid "Error: Unable to save encoder config." --msgstr "Error: No pude guardar el archivo de configuración" -+msgstr "Error: No pude guardar la configuración del codificador." - - #: src/cddev.c:174 src/cddev.c:601 - #, c-format - msgid "Drive status is %d\n" --msgstr "El estado del dispositivo es %s\n" -+msgstr "El estado del dispositivo es %d\n" - - #: src/cddev.c:176 - msgid "Drive doesn't support drive status check (assume CDS_NO_INFO)\n" -@@ -551,12 +539,11 @@ - - #: src/cddev.c:633 - msgid "CDIOCEJECT" --msgstr "" -+msgstr "CDIOCEJECT" - - #: src/cdplay.c:83 --#, fuzzy - msgid "Cannot do lookup while ripping." --msgstr "No puedo hacer una búsqueda mientras estoy extrayendo.." -+msgstr "No puedo hacer una búsqueda mientras estoy extrayendo." - - #. "misc" - #: src/cdplay.c:120 -@@ -576,7 +563,7 @@ - #: src/cdplay.c:189 - #, c-format - msgid "Querying %s for disc %02x.\n" --msgstr "Consutando %s poara el disco %02x.\n" -+msgstr "Consutando %s para el disco %02x.\n" - - #: src/cdplay.c:206 - #, c-format -@@ -600,9 +587,8 @@ - msgstr "No se encontró coincidencia\n" - - #: src/cdplay.c:242 src/cdplay.c:334 --#, fuzzy - msgid "Length" --msgstr "Duración" -+msgstr "Longitud" - - #: src/cdplay.c:299 - msgid "Tracks" -@@ -613,9 +599,8 @@ - msgstr "Pista" - - #: src/cdplay.c:633 src/discedit.c:390 --#, fuzzy - msgid "Error saving disc data." --msgstr "Error al guardar los datos del disco" -+msgstr "Error al guardar los datos del disco." - - #: src/cdplay.c:704 - msgid "Rotate play mode" -@@ -666,9 +651,8 @@ - msgstr "Expulsar disco" - - #: src/cdplay.c:962 --#, fuzzy - msgid "Scan Disc Contents" --msgstr "Tabla de contenido" -+msgstr "Analizar tabla de contenido" - - #: src/cdplay.c:970 - msgid "Toggle Volume Control" -@@ -680,7 +664,7 @@ - - #: src/cdplay.c:989 - msgid "Initiate/abort DiscDB lookup" --msgstr "Iniciar/abortar consulta a discDB" -+msgstr "Iniciar/abortar consulta a DiscDB" - - #: src/cdplay.c:999 - msgid "Toggle track display" -@@ -691,42 +675,36 @@ - msgstr "Salir de Grip" - - #: src/cdplay.c:1173 --#, fuzzy - msgid "Cannot fast forward while ripping." --msgstr "No puedo avanzar mientras esté extrayendo datos" -+msgstr "No puedo avanzar mientras esté extrayendo datos." - - #: src/cdplay.c:1204 --#, fuzzy - msgid "Cannot rewind while ripping." --msgstr "No puede retroceder mientras esté extrayendo datos" -+msgstr "No puede retroceder mientras esté extrayendo datos." - - #: src/cdplay.c:1235 --#, fuzzy - msgid "Cannot switch discs while ripping." --msgstr "No puedo conmutar mientras esté extrayendo datos" -+msgstr "No puedo cambiar de discos mientras esté extrayendo datos." - - #: src/cdplay.c:1253 - msgid "Eject disc\n" - msgstr "Espulsar disco\n" - - #: src/cdplay.c:1257 --#, fuzzy - msgid "Cannot eject while ripping." --msgstr "No puede expulsar mientras esté extrayendo datos" -+msgstr "No puede expulsar mientras esté extrayendo datos." - - #: src/cdplay.c:1267 - msgid "Have disc -- ejecting\n" - msgstr "Hay disco -- expulsando\n" - - #: src/cdplay.c:1334 --#, fuzzy - msgid "Cannot play while ripping." --msgstr "No puedo reproducir mientras esté extrayendo datos" -+msgstr "No puedo reproducir mientras esté extrayendo datos." - - #: src/cdplay.c:1402 src/cdplay.c:1433 --#, fuzzy - msgid "Cannot switch tracks while ripping." --msgstr "No puedo cambiar de pistas mientras esté extrayendo datos" -+msgstr "No puedo cambiar de pistas mientras esté extrayendo datos." - - #: src/cdplay.c:1524 - msgid "Checking for a new disc\n" -@@ -764,20 +742,18 @@ - "\n" - "Do you wish to submit this disc information?" - msgstr "" --"Este disco ha sido encontrado en tu servidor secundario,\n" --"pero no en tu servidor primario.\n" -+"Se ha encontrado este disco en su servidor secundario,\n" -+"pero no en su servidor primario.\n" - "\n" --"¿Deseas mandar esta informaciñon de disco?" -+"¿Deseas enviar la información del disco?" - - #: src/cdplay.c:1920 src/cdplay.c:1929 --#, fuzzy - msgid "Error: Unable to create temporary file." --msgstr "Error: No pude crear un archivo temporal" -+msgstr "Error: No pude crear un archivo temporal." - - #: src/cdplay.c:1947 --#, fuzzy - msgid "Error: Unable to write disc data." --msgstr "Error: No pude escribir los datos del disco" -+msgstr "Error: No pude escribir los datos del disco." - - #: src/cdplay.c:1956 - #, c-format -@@ -791,7 +767,7 @@ - #: src/discdb.c:207 - #, c-format - msgid "URI is %s\n" --msgstr "UR es %s\n" -+msgstr "URI es %s\n" - - #: src/discdb.c:287 - #, c-format -@@ -801,7 +777,7 @@ - #: src/discdb.c:788 - #, c-format - msgid "Stat error %d on %s\n" --msgstr "Errorde estado % en %s\n" -+msgstr "Error de estado %d en %s\n" - - #: src/discdb.c:792 - #, c-format -@@ -828,7 +804,7 @@ - - #: src/discedit.c:84 - msgid "W" --msgstr "" -+msgstr "W" - - #: src/discedit.c:110 - msgid "Disc artist" -@@ -836,11 +812,11 @@ - - #: src/discedit.c:127 - msgid "ID3 genre:" --msgstr "género ID3" -+msgstr "Género ID3" - - #: src/discedit.c:158 - msgid "Disc year" --msgstr "Añó del disco" -+msgstr "Año del disco" - - #: src/discedit.c:196 - msgid "Track artist" -@@ -856,11 +832,11 @@ - - #: src/discedit.c:224 - msgid "Artist/Title" --msgstr "Artista/Titulo" -+msgstr "Artista/Título" - - #: src/discedit.c:232 - msgid "Split chars" --msgstr "partir caractértes" -+msgstr "Partir caracteres" - - #: src/discedit.c:254 - msgid "Multi-artist" -@@ -872,29 +848,23 @@ - - #: src/discedit.c:274 - msgid "Submit disc info" --msgstr "Subir informacion del disco" -+msgstr "Enviar la informacion del disco" - - #: src/discedit.c:393 --#, fuzzy - msgid "No disc present." --msgstr "No hay disco presente" -+msgstr "No se ha encontrado ningún disco." - - #: src/discedit.c:543 --#, fuzzy - msgid "Cannot submit. No disc is present." --msgstr "" --"No puede mandar los datos\n" --"no hayd disco e labandeja" -+msgstr "No se pueden enviar los datos. No se ha encontrado ningún disco." - - #: src/discedit.c:558 --#, fuzzy - msgid "You must enter a disc title." --msgstr "Debes poner un titulo al disco" -+msgstr "Debes poner un título al disco." - - #: src/discedit.c:565 --#, fuzzy - msgid "You must enter a disc artist." --msgstr "Debes poner al artista" -+msgstr "Debes poner al artista del disco." - - #: src/discedit.c:575 - msgid "" -@@ -907,12 +877,12 @@ - "Continue?" - msgstr "" - "Estas apunto de mandar la información de este disco\n" --"a un servidor CDDB comercial, quienes entonces se\n" --"apoderarán de los datos que mandes. Esos servidores\n" --"hacen negocio con tu esfuerzo. Te sugerimos que mejor\n" -+"a un servidor CDDB comercial. Los datos que envíe\n" -+"le pertenecerán al servidor. Esos servidores\n" -+"hacen negocio con su esfuerzo. Le sugerimos que mejor\n" - "soportes a los servidores libres.\n" - "\n" --"¿Continuar de todos modos?" -+"¿Desea continuar de todos modos?" - - #: src/discedit.c:584 - msgid "" -@@ -921,10 +891,10 @@ - "\n" - "Continue?" - msgstr "" --"Estas apunto de mandar esta\n" -+"Está a punto de enviar esta\n" - "información via correo-e.\n" - "\n" --"¿Continuar?" -+"¿Desea continuar?" - - #: src/discedit.c:601 - msgid "Genre selection" -@@ -935,202 +905,205 @@ - "Submission requires a genre other than 'unknown'\n" - "Please select a DiscDB genre below" - msgstr "" -+"Es necesario especficar un género distinto de «unknown»\n" -+"para realizar el envío.\n" -+"Especifique un género DiscDB a continuación" - - #: src/discedit.c:615 - msgid "DiscDB genre" --msgstr "" -+msgstr "Género DiscDB" - - #: src/discedit.c:635 - msgid "Submit" --msgstr "" -+msgstr "Enviar" - - #: src/discedit.c:646 - msgid "Cancel" --msgstr "" -+msgstr "Cancelar" - - #. Doh! - #: src/id3.c:291 - msgid "unknown ID3 field\n" --msgstr "" -+msgstr "campo ID3 desconocido\n" - - #: src/launch.c:121 - #, c-format - msgid "Error: unable to translate filename. No such user as %s\n" --msgstr "" -+msgstr "Error: No se pudo traducir el nombre de archivo. No hay un usuario %s\n" - - #: src/launch.c:315 src/rip.c:1535 - msgid "Exec failed\n" --msgstr "" -+msgstr "Falló la ejecución\n" - - #: src/parsecfg.c:58 - msgid "Error: Bad entry type\n" --msgstr "" -+msgstr "Error: Tipo de entrada inválida\n" - - #: src/parsecfg.c:84 - msgid "Error: Invalid config file\n" --msgstr "" -+msgstr "Error: Archivo de configuración inválido\n" - - #: src/rip.c:104 - msgid "Rip+Encode" --msgstr "" -+msgstr "Extraer+Codificar" - - #: src/rip.c:106 - msgid "Rip and encode selected tracks" --msgstr "" -+msgstr "Extrae y codifica las pistas seleccionadas" - - #: src/rip.c:112 - msgid "Rip Only" --msgstr "" -+msgstr "Sólo extraer" - - #: src/rip.c:114 - msgid "Rip but do not encode selected tracks" --msgstr "" -+msgstr "Extrae pero no codifica las pistas seleccionadas" - - #: src/rip.c:120 - msgid "Abort Rip and Encode" --msgstr "" -+msgstr "Interrumpir extracción y codificación" - - #: src/rip.c:122 - msgid "Kill all active rip and encode processes" --msgstr "" -+msgstr "Mata todos los procesos activos de extracción y codificación" - - #: src/rip.c:130 - msgid "Abort Ripping Only" --msgstr "" -+msgstr "Interrumpir sólo la extracción" - - #: src/rip.c:132 - msgid "Kill rip process" --msgstr "" -+msgstr "Mata al proceso de extracción" - - #: src/rip.c:138 - msgid "DDJ Scan" --msgstr "" -+msgstr "Análisis DDJ" - - #: src/rip.c:140 - msgid "Insert disc information into the DigitalDJ database" --msgstr "" -+msgstr "Introduzca la información de disco en la base de datos DigitalDJ" - - #: src/rip.c:155 - msgid "Rip partial track" --msgstr "" -+msgstr "Extraer pista parcial" - - #: src/rip.c:166 - msgid "Play" --msgstr "" -+msgstr "Reproducir" - - #: src/rip.c:173 - msgid "Current sector: 0" --msgstr "" -+msgstr "Sector actual: 0" - - #: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:862 src/rip.c:915 - #: src/rip.c:917 src/rip.c:1065 src/rip.c:1066 - msgid "Rip: Idle" --msgstr "" -+msgstr "Ext: inactivo" - - #: src/rip.c:209 - msgid "Enc: Trk 99 (99.9x)" --msgstr "" -+msgstr "Codif: Trk 99 (99.9x)" - - #: src/rip.c:240 src/rip.c:282 src/rip.c:1036 src/rip.c:1050 --#, fuzzy - msgid "Enc: Idle" --msgstr "Codificador" -+msgstr "Codif: En espera" - - #: src/rip.c:264 - msgid "Overall indicators:" --msgstr "" -+msgstr "Indicadores globales:" - - #: src/rip.c:327 - msgid "Start sector" --msgstr "" -+msgstr "Sector de comienzo" - - #: src/rip.c:332 - msgid "End sector" --msgstr "" -+msgstr "Sector de fín" - - #: src/rip.c:380 --#, fuzzy, c-format -+#, c-format - msgid "Inserting track %d into the ddj database\n" --msgstr "Insertar la información en una base de datos SQL" -+msgstr "Insertando la pista %d en la base de datos ddj\n" - - #: src/rip.c:602 - msgid "Error: can't open m3u file." --msgstr "" -+msgstr "Error: No se pudo abrir el archivo m3u." - - #: src/rip.c:644 - msgid "In KillRip\n" --msgstr "" -+msgstr "En «KillRip»\n" - - #: src/rip.c:670 - #, c-format - msgid "Now total enc size is: %d\n" --msgstr "" -+msgstr "El tamaño total de codificación es: %d\n" - - #: src/rip.c:825 - #, c-format - msgid "Rip: Trk %d (%3.1fx)" --msgstr "" -+msgstr "Ext: Trk %d (%3.1fx)" - - #: src/rip.c:858 - #, c-format - msgid "Rip: %6.2f%%" --msgstr "" -+msgstr "Ext: %6.2f%%" - - #: src/rip.c:878 - msgid "Rip finished\n" --msgstr "" -+msgstr "Finalizó la extracción\n" - - #: src/rip.c:904 - #, c-format - msgid "Rip partial %d num wavs %d\n" --msgstr "" -+msgstr "Ext. parcial %d núm. wavs %d\n" - - #: src/rip.c:907 - #, c-format - msgid "Next track is %d, total is %d\n" --msgstr "" -+msgstr "La pista siguiente es %d, el total es %d\n" - - #: src/rip.c:913 - msgid "Check if we need to rip another track\n" --msgstr "" -+msgstr "Comprobando si es necesario extraer otra pista\n" - - #: src/rip.c:955 - #, c-format - msgid "Enc: Trk %d (%3.1fx)" --msgstr "" -+msgstr "Codif: Trk %d (%3.1fx)" - - #: src/rip.c:973 - #, c-format - msgid "Enc: %6.2f%%" --msgstr "" -+msgstr "Codif: %6.2f%%" - - #: src/rip.c:983 - #, c-format - msgid "Finished encoding on cpu %d\n" --msgstr "" -+msgstr "Finalizó la codificación en la CPU %d\n" - - #: src/rip.c:1001 - #, c-format - msgid "Deleting [%s]\n" --msgstr "" -+msgstr "Borrando [%s]\n" - - #: src/rip.c:1058 - msgid "Ripping is finished\n" --msgstr "" -+msgstr "Finalizó la extracción\n" - - #: src/rip.c:1169 src/rip.c:1175 - msgid "NoArtist" --msgstr "" -+msgstr "SinArtista" - -+# No poner el acento, se utiliza para crear directorios - #: src/rip.c:1180 - msgid "NoTitle" --msgstr "" -+msgstr "SinTitulo" - - #: src/rip.c:1270 - msgid "" - "No disc was detected in the drive. If you have a disc in your drive, please " - "check your CDRom device setting under Config->CD." --msgstr "" -+msgstr "No se detectó ningún disco en la unidad. Por favor, compruebe la configuración de su dispositivo CDROM en Config->CD si tiene un disco en la unidad." - - #: src/rip.c:1279 - msgid "" -@@ -1138,6 +1111,8 @@ - "Check your rip config, and ensure it specifies the full path to the ripper " - "executable." - msgstr "" -+"Ejecutable para extraer inválido\n" -+"Compruebe su configuración de extracción y asegúrese de que especifica la ruta completa al ejecutable para la extracción." - - #: src/rip.c:1287 - msgid "" -@@ -1145,102 +1120,106 @@ - "Check your encoder config, and ensure it specifies the full path to the " - "encoder executable." - msgstr "" -+"Ejecutable de codificación inválido.\n" -+"Compruebe la configuración de su codificador y asegúrese de que especifica una ruta completa al ejecutable de codificación." - - #: src/rip.c:1323 - msgid "" - "No tracks selected.\n" - "Rip whole CD?\n" - msgstr "" -+"No ha seleccionado ninguna pista.\n" -+"¿Desea extraer todo el CD?\n" - - #: src/rip.c:1346 - msgid "Ripping whole CD\n" --msgstr "" -+msgstr "Extrayendo todo el CD\n" - - #: src/rip.c:1385 - msgid "In RipNextTrack\n" --msgstr "" -+msgstr "En «RipNextTrack»\n" - - #: src/rip.c:1392 - #, c-format - msgid "First checked track is %d\n" --msgstr "" -+msgstr "La primera pista comprobada es %d\n" - - #: src/rip.c:1402 - msgid "Ripping away!\n" --msgstr "" -+msgstr "¡Comienza la extracción!\n" - - #: src/rip.c:1449 - msgid "No write access to write wav file" --msgstr "" -+msgstr "No tiene acceso de escritura para poder escribir en el archivo wav" - - #: src/rip.c:1463 - #, c-format - msgid "Ripping track %d to %s\n" --msgstr "" -+msgstr "Extrayendo la pista %d a %s\n" - - #: src/rip.c:1467 - #, c-format - msgid "Rip: Trk %d (0.0x)" --msgstr "" -+msgstr "Ext: Trk %d (0.0x)" - - #: src/rip.c:1472 - #, c-format - msgid "File %s has already been ripped. Skipping...\n" --msgstr "" -+msgstr "Ya se ha extraído el archivo %s. Omitiéndolo...\n" - - #: src/rip.c:1493 src/rip.c:1745 - msgid "Out of space in output directory" --msgstr "" -+msgstr "No queda espacio en el directorio de salida" - - #: src/rip.c:1569 - msgid "Calling CDPRip\n" --msgstr "" -+msgstr "Llamando a «CDPRip»\n" - - #: src/rip.c:1655 - #, c-format - msgid "Added track %d to %s list\n" --msgstr "" -+msgstr "Se añadió la pista %d a la lista %s\n" - - #: src/rip.c:1681 - msgid "No free cpus\n" --msgstr "" -+msgstr "No hay CPUs disponibles\n" - - #: src/rip.c:1697 --#, fuzzy, c-format -+#, c-format - msgid "Enc track %d\n" --msgstr "Pista %02d" -+msgstr "Codif pista %d\n" - - #: src/rip.c:1719 - msgid "No write access to write encoded file." --msgstr "" -+msgstr "No tiene acceso de escritura para poder escribir en el archivo de codificación." - - #: src/rip.c:1730 - #, c-format - msgid "%i: Encoding to %s\n" --msgstr "" -+msgstr "%i: Codificando a %s\n" - - #: src/rip.c:1734 - #, c-format - msgid "Enc: Trk %d (0.0x)" --msgstr "" -+msgstr "Cod: Trk %d (0.0x)" - - #: src/rip.c:1800 - msgid "In CalculateAll\n" --msgstr "" -+msgstr "En «CalculateAll»\n" - - #: src/rip.c:1806 - msgid "We aren't ripping now, so let's zero encoding values\n" --msgstr "" -+msgstr "No estamos extrayendo ahora, ponemos a cero los valores de codificación\n" - - #: src/rip.c:1822 - #, c-format - msgid "Total rip size is: %d\n" --msgstr "" -+msgstr "El tamaño total de extracción es: %d\n" - - #: src/rip.c:1823 - #, c-format - msgid "Total enc size is: %d\n" --msgstr "" -+msgstr "El tamaño total de codificación es: %d\n" - - #~ msgid "Keep application minimum size" - #~ msgstr "Mantener el tamaño de la aplicación lo más minimo posible" -@@ -1250,7 +1229,7 @@ - - #, fuzzy - #~ msgid "File System Character set encoding" --#~ msgstr "Borrar .wav despues de codificar" -+#~ msgstr "Conjunto de caracteres para archivos del sistema" - - #~ msgid "Could not parse geometry string `%s'" - #~ msgstr "No pude analizar la cadena de geometría `%s'" diff -Nru grip-3.3.1/debian/patches/06-version.dpatch grip-3.3.1/debian/patches/06-version.dpatch --- grip-3.3.1/debian/patches/06-version.dpatch 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/patches/06-version.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 06-version.dpatch by Hidetaka Iwai -## -## DP: If the translated string of "Version %s" is more than 20 bytes, sprintf -## DP: causes buffer overflow and grip may crash (Closes: #382516). - -@DPATCH@ - -diff -Naur grip-3.3.1.orig/src/grip.c grip-3.3.1/src/grip.c ---- grip-3.3.1.orig/src/grip.c 2006-08-11 16:40:39.000000000 +0000 -+++ grip-3.3.1/src/grip.c 2006-08-11 16:41:33.000000000 +0000 -@@ -541,7 +541,7 @@ - GtkWidget *logo; - GtkWidget *ebox; - GtkWidget *button; -- char versionbuf[20]; -+ gchar *versionbuf; - - aboutpage=MakeNewPage(uinfo->notebook,_("About")); - -@@ -562,8 +562,10 @@ - - vbox2=gtk_vbox_new(TRUE,0); - -- sprintf(versionbuf,_("Version %s"),VERSION); -+ versionbuf = g_strdup_printf(_("Version %s"),VERSION); - label=gtk_label_new(versionbuf); -+ g_free(versionbuf); -+ - gtk_widget_set_style(label,uinfo->style_wb); - gtk_box_pack_start(GTK_BOX(vbox2),label,FALSE,FALSE,0); - gtk_widget_show(label); diff -Nru grip-3.3.1/debian/patches/07-faac-aac.dpatch grip-3.3.1/debian/patches/07-faac-aac.dpatch --- grip-3.3.1/debian/patches/07-faac-aac.dpatch 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/patches/07-faac-aac.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 08-faac-aac.dpatch by Flavio Stanchina -## -## DP: Add encode configuration for AAC files (Closes: #279224). - -@DPATCH@ - -diff -Naur grip-3.3.1.orig/src/gripcfg.c grip-3.3.1/src/gripcfg.c ---- grip-3.3.1.orig/src/gripcfg.c 2005-06-25 18:00:55.000000000 +0000 -+++ grip-3.3.1/src/gripcfg.c 2006-09-29 09:26:10.000000000 +0000 -@@ -58,6 +58,9 @@ - "-o %m -a %a -l %d -t %n -b %b -N %t -G %G -d %y %w", - "ogg"}, - {"flac","-V -o %m %w","flac"}, -+ {"faac", -+ "-b %b -o %m -w --artist %a --title %n --genre %G --album %d --track %t/%N --year %y %w", -+ "m4a"}, - {"other","",""}, - {"",""} - }; diff -Nru grip-3.3.1/debian/patches/08-track-number.dpatch grip-3.3.1/debian/patches/08-track-number.dpatch --- grip-3.3.1/debian/patches/08-track-number.dpatch 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/patches/08-track-number.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 08-track-number.dpatch by Flavio Stanchina -## -## DP: Add %N switch for the number of tracks (Closes: #310176). - -@DPATCH@ - -diff -Naur grip-3.3.1.orig/doc/C/grip.xml grip-3.3.1/doc/C/grip.xml ---- grip-3.3.1.orig/doc/C/grip.xml 2004-04-15 17:51:47.000000000 +0000 -+++ grip-3.3.1/doc/C/grip.xml 2006-09-29 09:28:41.000000000 +0000 -@@ -1110,6 +1110,9 @@ - number,beginning at 1, and zero-filled (ie: '03' for the third - track). - -+ N — The number of -+ tracks, zero-filled (ie: '07'). -+ - s — The start sector of - the track. - -diff -Naur grip-3.3.1.orig/src/rip.c grip-3.3.1/src/rip.c ---- grip-3.3.1.orig/src/rip.c 2005-06-25 18:00:55.000000000 +0000 -+++ grip-3.3.1/src/rip.c 2006-09-29 09:28:41.000000000 +0000 -@@ -1147,6 +1147,10 @@ - g_snprintf(res,PATH_MAX,"%02d",enc_track->track_num+1); - *munge=FALSE; - break; -+ case 'N': -+ g_snprintf(res,PATH_MAX,"%02d",enc_track->ginfo->prog_totaltracks); -+ *munge=FALSE; -+ break; - case 's': - g_snprintf(res,PATH_MAX,"%d",enc_track->ginfo->start_sector); - *munge=FALSE; diff -Nru grip-3.3.1/debian/patches/09-gain-adjustment.dpatch grip-3.3.1/debian/patches/09-gain-adjustment.dpatch --- grip-3.3.1/debian/patches/09-gain-adjustment.dpatch 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/patches/09-gain-adjustment.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 09-gain-adjustment.dpatch by Adrian Cox -## -## DP: Applies album gain adjustment to the right album (Closes: #231886). - -@DPATCH@ - -diff -Naur grip-3.3.1.orig/src/rip.c grip-3.3.1/src/rip.c ---- grip-3.3.1.orig/src/rip.c 2005-06-25 18:00:55.000000000 +0000 -+++ grip-3.3.1/src/rip.c 2006-10-29 14:54:46.000000000 +0000 -@@ -1080,7 +1080,17 @@ - - #ifdef CDPAR - if(ginfo->using_builtin_cdp && ginfo->calc_gain) { -+ GList *plist; -+ - ginfo->disc_gain_adjustment=GetAlbumGain(); -+ -+ /* Apply disc gain to all tracks on pending list */ -+ for(plist = g_list_first(ginfo->pending_list); plist != NULL; -+ plist = g_list_next(plist)) { -+ EncodeTrack *enc_track = (EncodeTrack *) plist->data; -+ enc_track->disc_gain_adjustment = ginfo->disc_gain_adjustment; -+ } -+ - } - #endif - -@@ -1616,7 +1626,7 @@ - new_track->end_frame=ginfo->disc.track[track+1].start_frame-1; - #ifdef CDPAR - new_track->track_gain_adjustment=ginfo->track_gain_adjustment; -- new_track->disc_gain_adjustment=ginfo->disc_gain_adjustment; -+ new_track->disc_gain_adjustment=0.0; - #endif - - /* Compensate for the gap before a data track */ diff -Nru grip-3.3.1/debian/patches/10-executable-path.dpatch grip-3.3.1/debian/patches/10-executable-path.dpatch --- grip-3.3.1/debian/patches/10-executable-path.dpatch 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/patches/10-executable-path.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 10-executable-path.dpatch by Matt Zimmerman -## -## DP: Calls executables in path (Closes: #269596, #38447). - -@DPATCH@ - -diff -Naur grip-3.3.1.orig/src/rip.c grip-3.3.1/src/rip.c ---- grip-3.3.1.orig/src/rip.c 2005-06-25 18:00:55.000000000 +0000 -+++ grip-3.3.1/src/rip.c 2006-10-29 15:04:59.000000000 +0000 -@@ -1530,7 +1530,7 @@ - if(ginfo->rippid==0) { - CloseStuff(ginfo); - nice(ginfo->ripnice); -- execv(ginfo->ripexename,char_args); -+ execvp(ginfo->ripexename,char_args); - - LogStatus(ginfo,_("Exec failed\n")); - _exit(0); -@@ -1773,7 +1773,7 @@ - CloseStuff(ginfo); - setsid(); - nice(ginfo->mp3nice); -- execv(ginfo->mp3exename,char_args); -+ execvp(ginfo->mp3exename,char_args); - _exit(0); - } - else { diff -Nru grip-3.3.1/debian/patches/11-x-www-browser.dpatch grip-3.3.1/debian/patches/11-x-www-browser.dpatch --- grip-3.3.1/debian/patches/11-x-www-browser.dpatch 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/patches/11-x-www-browser.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 11-x-www-browser.dpatch by Frederic Bothamy -## -## DP: Replaces gnome specific browser call with x-www-browser -## DP: (Closes: #414277). - -@DPATCH@ - -diff -Naur grip-3.3.1.orig/src/grip.c grip-3.3.1/src/grip.c ---- grip-3.3.1.orig/src/grip.c 2005-06-25 18:00:55.000000000 +0000 -+++ grip-3.3.1/src/grip.c 2007-03-10 15:52:14.000000000 +0000 -@@ -625,7 +625,9 @@ - - static void Homepage(void) - { -- system("gnome-moz-remote http://www.nostatic.org/grip"); -+ if (system("gnome-moz-remote http://www.nostatic.org/grip")!=0) -+ if (system("x-www-browser http://www.nostatic.org/grip")!=0) -+ system("www-browser http://www.nostatic.org/grip"); - } - - static void LoadImages(GripGUI *uinfo) diff -Nru grip-3.3.1/debian/patches/add_codec_configs grip-3.3.1/debian/patches/add_codec_configs --- grip-3.3.1/debian/patches/add_codec_configs 1970-01-01 00:00:00.000000000 +0000 +++ grip-3.3.1/debian/patches/add_codec_configs 2013-04-08 13:21:01.000000000 +0000 @@ -0,0 +1,1233 @@ +Description: Upstream changes introduced in version 3.3.1-4 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + grip (3.3.1-4) lucid; urgency=low + . + * Added configurations for Musepack and Nero codecs. + . + The person named in the Author field signed this changelog entry. +Author: Marco Vermeulen + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- a/po/grip-2.2.pot ++++ /dev/null +@@ -1,1185 +0,0 @@ +-# SOME DESCRIPTIVE TITLE. +-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +-# This file is distributed under the same license as the PACKAGE package. +-# FIRST AUTHOR , YEAR. +-# +-#, fuzzy +-msgid "" +-msgstr "" +-"Project-Id-Version: PACKAGE VERSION\n" +-"Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2005-06-25 11:23-0700\n" +-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +-"Last-Translator: FULL NAME \n" +-"Language-Team: LANGUAGE \n" +-"MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=CHARSET\n" +-"Content-Transfer-Encoding: 8bit\n" +- +-#: src/main.c:56 +-msgid "Specify the geometry of the main window" +-msgstr "" +- +-#: src/main.c:57 +-msgid "GEOMETRY" +-msgstr "" +- +-#: src/main.c:65 +-msgid "Specify the config file to use (in your home dir)" +-msgstr "" +- +-#: src/main.c:66 +-msgid "CONFIG" +-msgstr "" +- +-#: src/main.c:74 +-msgid "Specify the cdrom device to use" +-msgstr "" +- +-#: src/main.c:75 src/main.c:84 +-msgid "DEVICE" +-msgstr "" +- +-#: src/main.c:83 +-msgid "Specify the generic scsi device to use" +-msgstr "" +- +-#: src/main.c:92 +-msgid "Launch in \"small\" (cd-only) mode" +-msgstr "" +- +-#: src/main.c:101 +-msgid "\"Local\" mode -- do not look up disc info on the net" +-msgstr "" +- +-#: src/main.c:110 +-msgid "Do not do I/O redirection" +-msgstr "" +- +-#: src/main.c:119 +-msgid "Run in verbose (debug) mode" +-msgstr "" +- +-#: src/grip.c:181 +-msgid "Grip" +-msgstr "" +- +-#: src/grip.c:238 +-#, c-format +-msgid "Error: Unable to initialize [%s]\n" +-msgstr "" +- +-#: src/grip.c:324 +-msgid "" +-"This is a development version of Grip. If you encounter problems, you are " +-"encouraged to revert to the latest stable version." +-msgstr "" +- +-#: src/grip.c:330 +-msgid "Grip started successfully\n" +-msgstr "" +- +-#: src/grip.c:344 +-msgid "" +-"Work is in progress.\n" +-"Really shut down?" +-msgstr "" +- +-#: src/grip.c:395 +-msgid "Status" +-msgstr "" +- +-#: src/grip.c:410 +-msgid "General" +-msgstr "" +- +-#: src/grip.c:425 src/gripcfg.c:362 src/cdplay.c:251 src/cdplay.c:345 +-#: src/rip.c:95 +-msgid "Rip" +-msgstr "" +- +-#: src/grip.c:440 src/gripcfg.c:496 +-msgid "Encode" +-msgstr "" +- +-#: src/grip.c:485 +-msgid "Help" +-msgstr "" +- +-#: src/grip.c:490 +-msgid "Table Of Contents" +-msgstr "" +- +-#: src/grip.c:496 +-msgid "Playing CDs" +-msgstr "" +- +-#: src/grip.c:502 +-msgid "Ripping CDs" +-msgstr "" +- +-#: src/grip.c:508 +-msgid "Configuring Grip" +-msgstr "" +- +-#: src/grip.c:514 +-msgid "FAQ" +-msgstr "" +- +-#: src/grip.c:520 +-msgid "Getting More Help" +-msgstr "" +- +-#: src/grip.c:526 +-msgid "Reporting Bugs" +-msgstr "" +- +-#: src/grip.c:546 +-msgid "About" +-msgstr "" +- +-#: src/grip.c:565 +-#, c-format +-msgid "Version %s" +-msgstr "" +- +-#: src/grip.c:905 +-msgid "Created by Grip" +-msgstr "" +- +-#: src/grip.c:922 +-msgid "" +-"Your config file is out of date -- resetting to defaults.\n" +-"You will need to re-configure Grip.\n" +-"Your old config file has been saved with -old appended." +-msgstr "" +- +-#: src/grip.c:995 +-#, c-format +-msgid "server is %s, port %d\n" +-msgstr "" +- +-#: src/grip.c:1016 +-msgid "Error: Unable to save config file." +-msgstr "" +- +-#: src/gripcfg.c:105 +-msgid "Config" +-msgstr "" +- +-#: src/gripcfg.c:113 +-msgid "CDRom device" +-msgstr "" +- +-#: src/gripcfg.c:118 +-msgid "Don't interrupt playback on exit/startup" +-msgstr "" +- +-#: src/gripcfg.c:122 +-msgid "Rewind when stopped" +-msgstr "" +- +-#: src/gripcfg.c:127 +-msgid "Startup with first track if not playing" +-msgstr "" +- +-#: src/gripcfg.c:132 +-msgid "Auto-play on disc insert" +-msgstr "" +- +-#: src/gripcfg.c:137 +-msgid "Reshuffle before each playback" +-msgstr "" +- +-#: src/gripcfg.c:142 +-msgid "Work around faulty eject" +-msgstr "" +- +-#: src/gripcfg.c:147 +-msgid "Poll disc drive for new disc" +-msgstr "" +- +-#: src/gripcfg.c:151 +-msgid "Poll interval (seconds)" +-msgstr "" +- +-#: src/gripcfg.c:159 +-msgid "CD" +-msgstr "" +- +-#: src/gripcfg.c:175 +-msgid "Ripper:" +-msgstr "" +- +-#: src/gripcfg.c:220 +-msgid "Ripping executable" +-msgstr "" +- +-#: src/gripcfg.c:225 +-msgid "Rip command-line" +-msgstr "" +- +-#: src/gripcfg.c:236 +-msgid "Disable paranoia" +-msgstr "" +- +-#: src/gripcfg.c:241 +-msgid "Disable extra paranoia" +-msgstr "" +- +-#: src/gripcfg.c:247 +-msgid "Disable scratch" +-msgstr "" +- +-#: src/gripcfg.c:251 +-msgid "detection" +-msgstr "" +- +-#: src/gripcfg.c:255 +-msgid "repair" +-msgstr "" +- +-#: src/gripcfg.c:263 +-msgid "Calculate gain adjustment" +-msgstr "" +- +-#: src/gripcfg.c:271 +-msgid "Rip file format" +-msgstr "" +- +-#: src/gripcfg.c:275 +-msgid "Generic SCSI device" +-msgstr "" +- +-#: src/gripcfg.c:283 +-msgid "Ripper" +-msgstr "" +- +-#: src/gripcfg.c:292 +-msgid "Rip 'nice' value" +-msgstr "" +- +-#: src/gripcfg.c:296 +-msgid "Max non-encoded .wav's" +-msgstr "" +- +-#: src/gripcfg.c:302 +-msgid "Auto-rip on insert" +-msgstr "" +- +-#: src/gripcfg.c:306 +-msgid "Beep after rip" +-msgstr "" +- +-#: src/gripcfg.c:316 +-msgid "Auto-eject after rip" +-msgstr "" +- +-#: src/gripcfg.c:320 +-msgid "Auto-eject delay" +-msgstr "" +- +-#: src/gripcfg.c:328 +-msgid "Delay before ripping" +-msgstr "" +- +-#: src/gripcfg.c:333 +-msgid "Delay encoding until disc is ripped" +-msgstr "" +- +-#: src/gripcfg.c:338 +-msgid "Stop cdrom drive between tracks" +-msgstr "" +- +-#: src/gripcfg.c:342 +-msgid "Wav filter command" +-msgstr "" +- +-#: src/gripcfg.c:347 +-msgid "Disc filter command" +-msgstr "" +- +-#: src/gripcfg.c:355 src/gripcfg.c:489 +-msgid "Options" +-msgstr "" +- +-#: src/gripcfg.c:377 +-msgid "Encoder:" +-msgstr "" +- +-#: src/gripcfg.c:412 +-msgid "Encoder executable" +-msgstr "" +- +-#: src/gripcfg.c:417 +-msgid "Encoder command-line" +-msgstr "" +- +-#: src/gripcfg.c:423 +-msgid "Encode file extension" +-msgstr "" +- +-#: src/gripcfg.c:428 +-msgid "Encode file format" +-msgstr "" +- +-#: src/gripcfg.c:436 +-msgid "Encoder" +-msgstr "" +- +-#: src/gripcfg.c:446 +-msgid "Delete .wav after encoding" +-msgstr "" +- +-#: src/gripcfg.c:451 +-msgid "Insert info into SQL database" +-msgstr "" +- +-#: src/gripcfg.c:455 +-msgid "Create .m3u files" +-msgstr "" +- +-#: src/gripcfg.c:460 +-msgid "Use relative paths in .m3u files" +-msgstr "" +- +-#: src/gripcfg.c:464 +-msgid "M3U file format" +-msgstr "" +- +-#: src/gripcfg.c:469 +-msgid "Encoding bitrate (kbits/sec)" +-msgstr "" +- +-#: src/gripcfg.c:473 +-msgid "Number of CPUs to use" +-msgstr "" +- +-#: src/gripcfg.c:477 +-msgid "Encode 'nice' value" +-msgstr "" +- +-#: src/gripcfg.c:481 +-msgid "Encode filter command" +-msgstr "" +- +-#: src/gripcfg.c:505 +-msgid "Add ID3 tags to encoded files" +-msgstr "" +- +-#: src/gripcfg.c:511 +-msgid "Add ID3v2 tags to encoded files" +-msgstr "" +- +-#: src/gripcfg.c:517 +-msgid "Only tag files ending in '.mp3'" +-msgstr "" +- +-#: src/gripcfg.c:521 +-msgid "ID3 comment field" +-msgstr "" +- +-#: src/gripcfg.c:526 +-msgid "ID3v1 Character set encoding" +-msgstr "" +- +-#: src/gripcfg.c:532 +-msgid "ID3v2 Character set encoding" +-msgstr "" +- +-#: src/gripcfg.c:540 +-msgid "ID3" +-msgstr "" +- +-#: src/gripcfg.c:557 src/gripcfg.c:577 +-msgid "DB server" +-msgstr "" +- +-#: src/gripcfg.c:561 src/gripcfg.c:581 +-msgid "CGI path" +-msgstr "" +- +-#: src/gripcfg.c:568 +-msgid "Primary Server" +-msgstr "" +- +-#: src/gripcfg.c:588 +-msgid "Secondary Server" +-msgstr "" +- +-#: src/gripcfg.c:598 +-msgid "DB Submit email" +-msgstr "" +- +-#: src/gripcfg.c:603 +-msgid "DB Character set encoding" +-msgstr "" +- +-#: src/gripcfg.c:608 +-msgid "Use freedb extensions" +-msgstr "" +- +-#: src/gripcfg.c:613 +-msgid "Perform disc lookups automatically" +-msgstr "" +- +-#: src/gripcfg.c:621 +-msgid "DiscDB" +-msgstr "" +- +-#: src/gripcfg.c:630 +-msgid "Use proxy server" +-msgstr "" +- +-#: src/gripcfg.c:637 +-msgid "Get server from 'http_proxy' env. var" +-msgstr "" +- +-#: src/gripcfg.c:641 +-msgid "Proxy server" +-msgstr "" +- +-#: src/gripcfg.c:645 +-msgid "Proxy port" +-msgstr "" +- +-#: src/gripcfg.c:649 +-msgid "Proxy username" +-msgstr "" +- +-#: src/gripcfg.c:655 +-msgid "Proxy password" +-msgstr "" +- +-#: src/gripcfg.c:663 +-msgid "Proxy" +-msgstr "" +- +-#: src/gripcfg.c:672 +-msgid "Email address" +-msgstr "" +- +-#: src/gripcfg.c:676 +-msgid "CD update program" +-msgstr "" +- +-#: src/gripcfg.c:681 +-msgid "Do not lowercase filenames" +-msgstr "" +- +-#: src/gripcfg.c:686 +-msgid "Allow high bits in filenames" +-msgstr "" +- +-#: src/gripcfg.c:691 +-msgid "Replace incompatible characters by hexadecimal numbers" +-msgstr "" +- +-#: src/gripcfg.c:696 +-msgid "Do not change spaces to underscores" +-msgstr "" +- +-#: src/gripcfg.c:701 +-msgid "" +-"Characters to not strip\n" +-"in filenames" +-msgstr "" +- +-#: src/gripcfg.c:706 +-msgid "Show tray icon" +-msgstr "" +- +-#: src/gripcfg.c:713 +-msgid "Misc" +-msgstr "" +- +-#: src/gripcfg.c:819 +-msgid "Error: Unable to save ripper config." +-msgstr "" +- +-#: src/gripcfg.c:890 +-msgid "Error: Unable to save encoder config." +-msgstr "" +- +-#: src/cddev.c:174 src/cddev.c:601 +-#, c-format +-msgid "Drive status is %d\n" +-msgstr "" +- +-#: src/cddev.c:176 +-msgid "Drive doesn't support drive status check (assume CDS_NO_INFO)\n" +-msgstr "" +- +-#: src/cddev.c:179 +-msgid "No disc\n" +-msgstr "" +- +-#: src/cddev.c:281 src/cddev.c:290 src/cddev.c:307 src/cddev.c:334 +-msgid "Error: Failed to read disc contents\n" +-msgstr "" +- +-#: src/cddev.c:604 +-msgid "Drive doesn't support drive status check\n" +-msgstr "" +- +-#: src/cddev.c:625 src/cddev.c:629 +-#, c-format +-msgid "Unlock failed: %d" +-msgstr "" +- +-#: src/cddev.c:633 +-msgid "CDIOCEJECT" +-msgstr "" +- +-#: src/cdplay.c:83 +-msgid "Cannot do lookup while ripping." +-msgstr "" +- +-#. "misc" +-#: src/cdplay.c:120 +-msgid "Unknown Disc" +-msgstr "" +- +-#: src/cdplay.c:124 +-#, c-format +-msgid "Track %02d" +-msgstr "" +- +-#: src/cdplay.c:184 +-#, c-format +-msgid "Querying %s (through %s) for disc %02x.\n" +-msgstr "" +- +-#: src/cdplay.c:189 +-#, c-format +-msgid "Querying %s for disc %02x.\n" +-msgstr "" +- +-#: src/cdplay.c:206 +-#, c-format +-msgid "" +-"Match for \"%s / %s\"\n" +-"Downloading data...\n" +-msgstr "" +- +-#: src/cdplay.c:214 +-msgid "Done\n" +-msgstr "" +- +-#: src/cdplay.c:218 +-msgid "Error saving disc data\n" +-msgstr "" +- +-#: src/cdplay.c:224 +-msgid "No match\n" +-msgstr "" +- +-#: src/cdplay.c:242 src/cdplay.c:334 +-msgid "Length" +-msgstr "" +- +-#: src/cdplay.c:299 +-msgid "Tracks" +-msgstr "" +- +-#: src/cdplay.c:323 +-msgid "Track" +-msgstr "" +- +-#: src/cdplay.c:633 src/discedit.c:390 +-msgid "Error saving disc data." +-msgstr "" +- +-#: src/cdplay.c:704 +-msgid "Rotate play mode" +-msgstr "" +- +-#: src/cdplay.c:724 +-msgid "Toggle loop play" +-msgstr "" +- +-#: src/cdplay.c:802 src/rip.c:230 +-msgid "Rip status" +-msgstr "" +- +-#: src/cdplay.c:869 +-msgid "Play track / Pause play" +-msgstr "" +- +-#: src/cdplay.c:880 +-msgid "Rewind" +-msgstr "" +- +-#: src/cdplay.c:891 +-msgid "FastForward" +-msgstr "" +- +-#: src/cdplay.c:901 +-msgid "Go to previous track" +-msgstr "" +- +-#: src/cdplay.c:910 +-msgid "Go to next track" +-msgstr "" +- +-#: src/cdplay.c:919 +-msgid "Toggle play mode options" +-msgstr "" +- +-#: src/cdplay.c:929 +-msgid "Next Disc" +-msgstr "" +- +-#: src/cdplay.c:943 +-msgid "Stop play" +-msgstr "" +- +-#: src/cdplay.c:953 +-msgid "Eject disc" +-msgstr "" +- +-#: src/cdplay.c:962 +-msgid "Scan Disc Contents" +-msgstr "" +- +-#: src/cdplay.c:970 +-msgid "Toggle Volume Control" +-msgstr "" +- +-#: src/cdplay.c:979 +-msgid "Toggle disc editor" +-msgstr "" +- +-#: src/cdplay.c:989 +-msgid "Initiate/abort DiscDB lookup" +-msgstr "" +- +-#: src/cdplay.c:999 +-msgid "Toggle track display" +-msgstr "" +- +-#: src/cdplay.c:1006 +-msgid "Exit Grip" +-msgstr "" +- +-#: src/cdplay.c:1173 +-msgid "Cannot fast forward while ripping." +-msgstr "" +- +-#: src/cdplay.c:1204 +-msgid "Cannot rewind while ripping." +-msgstr "" +- +-#: src/cdplay.c:1235 +-msgid "Cannot switch discs while ripping." +-msgstr "" +- +-#: src/cdplay.c:1253 +-msgid "Eject disc\n" +-msgstr "" +- +-#: src/cdplay.c:1257 +-msgid "Cannot eject while ripping." +-msgstr "" +- +-#: src/cdplay.c:1267 +-msgid "Have disc -- ejecting\n" +-msgstr "" +- +-#: src/cdplay.c:1334 +-msgid "Cannot play while ripping." +-msgstr "" +- +-#: src/cdplay.c:1402 src/cdplay.c:1433 +-msgid "Cannot switch tracks while ripping." +-msgstr "" +- +-#: src/cdplay.c:1524 +-msgid "Checking for a new disc\n" +-msgstr "" +- +-#: src/cdplay.c:1529 +-msgid "CDStat found a disc, checking tracks\n" +-msgstr "" +- +-#: src/cdplay.c:1532 +-msgid "We have a valid disc!\n" +-msgstr "" +- +-#: src/cdplay.c:1559 +-msgid "No non-zero length tracks\n" +-msgstr "" +- +-#: src/cdplay.c:1568 +-msgid "CDStat said no disc\n" +-msgstr "" +- +-#: src/cdplay.c:1717 src/cdplay.c:1739 +-#, c-format +-msgid "Current sector: %6d" +-msgstr "" +- +-#: src/cdplay.c:1840 +-msgid "No Disc" +-msgstr "" +- +-#: src/cdplay.c:1892 +-msgid "" +-"This disc has been found on your secondary server,\n" +-"but not on your primary server.\n" +-"\n" +-"Do you wish to submit this disc information?" +-msgstr "" +- +-#: src/cdplay.c:1920 src/cdplay.c:1929 +-msgid "Error: Unable to create temporary file." +-msgstr "" +- +-#: src/cdplay.c:1947 +-msgid "Error: Unable to write disc data." +-msgstr "" +- +-#: src/cdplay.c:1956 +-#, c-format +-msgid "Mailing entry to %s\n" +-msgstr "" +- +-#: src/dialog.c:44 +-msgid "System Message" +-msgstr "" +- +-#: src/discdb.c:207 +-#, c-format +-msgid "URI is %s\n" +-msgstr "" +- +-#: src/discdb.c:287 +-#, c-format +-msgid "Query is [%s]\n" +-msgstr "" +- +-#: src/discdb.c:788 +-#, c-format +-msgid "Stat error %d on %s\n" +-msgstr "" +- +-#: src/discdb.c:792 +-#, c-format +-msgid "Creating directory %s\n" +-msgstr "" +- +-#: src/discdb.c:797 +-#, c-format +-msgid "Error: %s exists, but is a file\n" +-msgstr "" +- +-#: src/discdb.c:804 +-#, c-format +-msgid "Error: Unable to open %s for writing\n" +-msgstr "" +- +-#: src/discedit.c:67 +-msgid "Disc title" +-msgstr "" +- +-#: src/discedit.c:74 src/discedit.c:176 +-msgid "Track name" +-msgstr "" +- +-#: src/discedit.c:84 +-msgid "W" +-msgstr "" +- +-#: src/discedit.c:110 +-msgid "Disc artist" +-msgstr "" +- +-#: src/discedit.c:127 +-msgid "ID3 genre:" +-msgstr "" +- +-#: src/discedit.c:158 +-msgid "Disc year" +-msgstr "" +- +-#: src/discedit.c:196 +-msgid "Track artist" +-msgstr "" +- +-#: src/discedit.c:213 +-msgid "Split:" +-msgstr "" +- +-#: src/discedit.c:217 +-msgid "Title/Artist" +-msgstr "" +- +-#: src/discedit.c:224 +-msgid "Artist/Title" +-msgstr "" +- +-#: src/discedit.c:232 +-msgid "Split chars" +-msgstr "" +- +-#: src/discedit.c:254 +-msgid "Multi-artist" +-msgstr "" +- +-#: src/discedit.c:265 +-msgid "Save disc info" +-msgstr "" +- +-#: src/discedit.c:274 +-msgid "Submit disc info" +-msgstr "" +- +-#: src/discedit.c:393 +-msgid "No disc present." +-msgstr "" +- +-#: src/discedit.c:543 +-msgid "Cannot submit. No disc is present." +-msgstr "" +- +-#: src/discedit.c:558 +-msgid "You must enter a disc title." +-msgstr "" +- +-#: src/discedit.c:565 +-msgid "You must enter a disc artist." +-msgstr "" +- +-#: src/discedit.c:575 +-msgid "" +-"You are about to submit this disc information\n" +-"to a commercial CDDB server, which will then\n" +-"own the data that you submit. These servers make\n" +-"a profit out of your effort. We suggest that you\n" +-"support free servers instead.\n" +-"\n" +-"Continue?" +-msgstr "" +- +-#: src/discedit.c:584 +-msgid "" +-"You are about to submit this\n" +-"disc information via email.\n" +-"\n" +-"Continue?" +-msgstr "" +- +-#: src/discedit.c:601 +-msgid "Genre selection" +-msgstr "" +- +-#: src/discedit.c:605 +-msgid "" +-"Submission requires a genre other than 'unknown'\n" +-"Please select a DiscDB genre below" +-msgstr "" +- +-#: src/discedit.c:615 +-msgid "DiscDB genre" +-msgstr "" +- +-#: src/discedit.c:635 +-msgid "Submit" +-msgstr "" +- +-#: src/discedit.c:646 +-msgid "Cancel" +-msgstr "" +- +-#. Doh! +-#: src/id3.c:291 +-msgid "unknown ID3 field\n" +-msgstr "" +- +-#: src/launch.c:121 +-#, c-format +-msgid "Error: unable to translate filename. No such user as %s\n" +-msgstr "" +- +-#: src/launch.c:315 src/rip.c:1535 +-msgid "Exec failed\n" +-msgstr "" +- +-#: src/parsecfg.c:58 +-msgid "Error: Bad entry type\n" +-msgstr "" +- +-#: src/parsecfg.c:84 +-msgid "Error: Invalid config file\n" +-msgstr "" +- +-#: src/rip.c:104 +-msgid "Rip+Encode" +-msgstr "" +- +-#: src/rip.c:106 +-msgid "Rip and encode selected tracks" +-msgstr "" +- +-#: src/rip.c:112 +-msgid "Rip Only" +-msgstr "" +- +-#: src/rip.c:114 +-msgid "Rip but do not encode selected tracks" +-msgstr "" +- +-#: src/rip.c:120 +-msgid "Abort Rip and Encode" +-msgstr "" +- +-#: src/rip.c:122 +-msgid "Kill all active rip and encode processes" +-msgstr "" +- +-#: src/rip.c:130 +-msgid "Abort Ripping Only" +-msgstr "" +- +-#: src/rip.c:132 +-msgid "Kill rip process" +-msgstr "" +- +-#: src/rip.c:138 +-msgid "DDJ Scan" +-msgstr "" +- +-#: src/rip.c:140 +-msgid "Insert disc information into the DigitalDJ database" +-msgstr "" +- +-#: src/rip.c:155 +-msgid "Rip partial track" +-msgstr "" +- +-#: src/rip.c:166 +-msgid "Play" +-msgstr "" +- +-#: src/rip.c:173 +-msgid "Current sector: 0" +-msgstr "" +- +-#: src/rip.c:204 src/rip.c:221 src/rip.c:269 src/rip.c:862 src/rip.c:915 +-#: src/rip.c:917 src/rip.c:1065 src/rip.c:1066 +-msgid "Rip: Idle" +-msgstr "" +- +-#: src/rip.c:209 +-msgid "Enc: Trk 99 (99.9x)" +-msgstr "" +- +-#: src/rip.c:240 src/rip.c:282 src/rip.c:1036 src/rip.c:1050 +-msgid "Enc: Idle" +-msgstr "" +- +-#: src/rip.c:264 +-msgid "Overall indicators:" +-msgstr "" +- +-#: src/rip.c:327 +-msgid "Start sector" +-msgstr "" +- +-#: src/rip.c:332 +-msgid "End sector" +-msgstr "" +- +-#: src/rip.c:380 +-#, c-format +-msgid "Inserting track %d into the ddj database\n" +-msgstr "" +- +-#: src/rip.c:602 +-msgid "Error: can't open m3u file." +-msgstr "" +- +-#: src/rip.c:644 +-msgid "In KillRip\n" +-msgstr "" +- +-#: src/rip.c:670 +-#, c-format +-msgid "Now total enc size is: %d\n" +-msgstr "" +- +-#: src/rip.c:825 +-#, c-format +-msgid "Rip: Trk %d (%3.1fx)" +-msgstr "" +- +-#: src/rip.c:858 +-#, c-format +-msgid "Rip: %6.2f%%" +-msgstr "" +- +-#: src/rip.c:878 +-msgid "Rip finished\n" +-msgstr "" +- +-#: src/rip.c:904 +-#, c-format +-msgid "Rip partial %d num wavs %d\n" +-msgstr "" +- +-#: src/rip.c:907 +-#, c-format +-msgid "Next track is %d, total is %d\n" +-msgstr "" +- +-#: src/rip.c:913 +-msgid "Check if we need to rip another track\n" +-msgstr "" +- +-#: src/rip.c:955 +-#, c-format +-msgid "Enc: Trk %d (%3.1fx)" +-msgstr "" +- +-#: src/rip.c:973 +-#, c-format +-msgid "Enc: %6.2f%%" +-msgstr "" +- +-#: src/rip.c:983 +-#, c-format +-msgid "Finished encoding on cpu %d\n" +-msgstr "" +- +-#: src/rip.c:1001 +-#, c-format +-msgid "Deleting [%s]\n" +-msgstr "" +- +-#: src/rip.c:1058 +-msgid "Ripping is finished\n" +-msgstr "" +- +-#: src/rip.c:1169 src/rip.c:1175 +-msgid "NoArtist" +-msgstr "" +- +-#: src/rip.c:1180 +-msgid "NoTitle" +-msgstr "" +- +-#: src/rip.c:1270 +-msgid "" +-"No disc was detected in the drive. If you have a disc in your drive, please " +-"check your CDRom device setting under Config->CD." +-msgstr "" +- +-#: src/rip.c:1279 +-msgid "" +-"Invalid rip executable.\n" +-"Check your rip config, and ensure it specifies the full path to the ripper " +-"executable." +-msgstr "" +- +-#: src/rip.c:1287 +-msgid "" +-"Invalid encoder executable.\n" +-"Check your encoder config, and ensure it specifies the full path to the " +-"encoder executable." +-msgstr "" +- +-#: src/rip.c:1323 +-msgid "" +-"No tracks selected.\n" +-"Rip whole CD?\n" +-msgstr "" +- +-#: src/rip.c:1346 +-msgid "Ripping whole CD\n" +-msgstr "" +- +-#: src/rip.c:1385 +-msgid "In RipNextTrack\n" +-msgstr "" +- +-#: src/rip.c:1392 +-#, c-format +-msgid "First checked track is %d\n" +-msgstr "" +- +-#: src/rip.c:1402 +-msgid "Ripping away!\n" +-msgstr "" +- +-#: src/rip.c:1449 +-msgid "No write access to write wav file" +-msgstr "" +- +-#: src/rip.c:1463 +-#, c-format +-msgid "Ripping track %d to %s\n" +-msgstr "" +- +-#: src/rip.c:1467 +-#, c-format +-msgid "Rip: Trk %d (0.0x)" +-msgstr "" +- +-#: src/rip.c:1472 +-#, c-format +-msgid "File %s has already been ripped. Skipping...\n" +-msgstr "" +- +-#: src/rip.c:1493 src/rip.c:1745 +-msgid "Out of space in output directory" +-msgstr "" +- +-#: src/rip.c:1569 +-msgid "Calling CDPRip\n" +-msgstr "" +- +-#: src/rip.c:1655 +-#, c-format +-msgid "Added track %d to %s list\n" +-msgstr "" +- +-#: src/rip.c:1681 +-msgid "No free cpus\n" +-msgstr "" +- +-#: src/rip.c:1697 +-#, c-format +-msgid "Enc track %d\n" +-msgstr "" +- +-#: src/rip.c:1719 +-msgid "No write access to write encoded file." +-msgstr "" +- +-#: src/rip.c:1730 +-#, c-format +-msgid "%i: Encoding to %s\n" +-msgstr "" +- +-#: src/rip.c:1734 +-#, c-format +-msgid "Enc: Trk %d (0.0x)" +-msgstr "" +- +-#: src/rip.c:1800 +-msgid "In CalculateAll\n" +-msgstr "" +- +-#: src/rip.c:1806 +-msgid "We aren't ripping now, so let's zero encoding values\n" +-msgstr "" +- +-#: src/rip.c:1822 +-#, c-format +-msgid "Total rip size is: %d\n" +-msgstr "" +- +-#: src/rip.c:1823 +-#, c-format +-msgid "Total enc size is: %d\n" +-msgstr "" +--- a/src/gripcfg.c ++++ b/src/gripcfg.c +@@ -51,13 +51,12 @@ + {"lame","-h -b %b %w %m","mp3"}, + {"l3enc","-br %b %w %m","mp3"}, + {"xingmp3enc","-B %b -Q %w","mp3"}, +- {"mp3encode","-p 2 -l 3 -b %b %w %m", +- "mp3"}, ++ {"mp3encode","-p 2 -l 3 -b %b %w %m","mp3"}, + {"gogo","-b %b %w %m","mp3"}, +- {"oggenc", +- "-o %m -a %a -l %d -t %n -b %b -N %t -G %G -d %y %w", +- "ogg"}, ++ {"oggenc","-o %m -a %a -l %d -t %n -b %b -N %t -G %G -d %y %w","ogg"}, + {"flac","-V -o %m %w","flac"}, ++ {"neroenc","0.55 %w %m %n %a %t %d %y","m4a"}, ++ {"mpcenc","--extreme --artist %a --title %n --album %d --track %t --genre %G --year %y %w %m","mpc"}, + {"other","",""}, + {"",""} + }; diff -Nru grip-3.3.1/debian/patches/cdrom_audio_invalid grip-3.3.1/debian/patches/cdrom_audio_invalid --- grip-3.3.1/debian/patches/cdrom_audio_invalid 1970-01-01 00:00:00.000000000 +0000 +++ grip-3.3.1/debian/patches/cdrom_audio_invalid 2013-04-08 10:02:49.000000000 +0000 @@ -0,0 +1,12 @@ +--- a/src/cddev.c ++++ b/src/cddev.c +@@ -258,6 +258,9 @@ + cdsc.cdsc_absaddr.msf.frame; + + switch(cdsc.cdsc_audiostatus) { ++ case CDROM_AUDIO_INVALID: ++ disc->disc_mode = CDAUDIO_NOSTATUS; ++ break; + case CDROM_AUDIO_PLAY: + disc->disc_mode=CDAUDIO_PLAYING; + break; diff -Nru grip-3.3.1/debian/patches/grip-3.3.1-invalid-genre-size.patch grip-3.3.1/debian/patches/grip-3.3.1-invalid-genre-size.patch --- grip-3.3.1/debian/patches/grip-3.3.1-invalid-genre-size.patch 1970-01-01 00:00:00.000000000 +0000 +++ grip-3.3.1/debian/patches/grip-3.3.1-invalid-genre-size.patch 2013-04-08 10:05:26.000000000 +0000 @@ -0,0 +1,28 @@ +--- a/src/id3.c ++++ b/src/id3.c +@@ -252,8 +252,8 @@ + + if ( frames[ i ] ) { + char *c_data = NULL; +- char gen[ 5 ] = "( )"; +- char trk[ 4 ] = " "; ++ char gen[ 6 ] = "( )"; /* max unsigned char: 255 */ ++ char trk[ 3 ] = " "; /* max CDDA tracks: 99 */ + + switch( frameids[ i ] ) { + case ID3FID_TITLE: +@@ -278,12 +278,12 @@ + + case ID3FID_CONTENTTYPE: + c_data = gen; +- sprintf( gen, "(%d)", genre ); /* XXX */ ++ snprintf( gen, 6, "(%d)", genre ); + break; + + case ID3FID_TRACKNUM: + c_data = trk; +- sprintf( trk, "%d", tracknum ); /* XXX */ ++ snprintf( trk, 3, "%d", tracknum ); + break; + + default: diff -Nru grip-3.3.1/debian/patches/grip-3.3.1_multi.patch grip-3.3.1/debian/patches/grip-3.3.1_multi.patch --- grip-3.3.1/debian/patches/grip-3.3.1_multi.patch 1970-01-01 00:00:00.000000000 +0000 +++ grip-3.3.1/debian/patches/grip-3.3.1_multi.patch 2013-04-08 10:04:03.000000000 +0000 @@ -0,0 +1,218 @@ +add multi-artist file formats for rip and encode: + adds the configuration options ripfileformat_multi and mp3fileformat_multi, + which are used when the "Multi-artist" mode is active for a CD, + as well as entry fields in the GUI. + +--- a/doc/C/grip.xml ++++ b/doc/C/grip.xml +@@ -598,7 +598,15 @@ + + + Rip file format — This allows to +- you configure the filename and path that Grip rips files to. The ++ configure the filename and path that Grip rips files to. The ++ list of available switches can be found in . ++ ++ ++ ++ Rip file format (Multi-artist) — ++ This allows to configure the filename and path that Grip rips files ++ to for CDs that are marked as Multi-artist in the Track Edit. The + list of available switches can be found in . + +@@ -760,7 +768,15 @@ + + + Encode file format — This allows to +- you configure the filename and path that Grip encodes to. The ++ configure the filename and path that Grip encodes to. The ++ list of available switches can be found in . ++ ++ ++ ++ Encode file format (Multi-artist) — ++ This allows to configure the filename and path that Grip encodes ++ to for CDs that are marked as Multi-artist in the Track Edit. The + list of available switches can be found in . + +--- a/src/grip.c ++++ b/src/grip.c +@@ -65,7 +65,9 @@ + {"mp3cmdline",CFG_ENTRY_STRING,256,ginfo->mp3cmdline},\ + {"dbserver",CFG_ENTRY_STRING,256,ginfo->dbserver.name},\ + {"ripfileformat",CFG_ENTRY_STRING,256,ginfo->ripfileformat},\ ++{"ripfileformat_multi",CFG_ENTRY_STRING,256,ginfo->ripfileformat_multi},\ + {"mp3fileformat",CFG_ENTRY_STRING,256,ginfo->mp3fileformat},\ ++{"mp3fileformat_multi",CFG_ENTRY_STRING,256,ginfo->mp3fileformat_multi},\ + {"mp3extension",CFG_ENTRY_STRING,10,ginfo->mp3extension},\ + {"m3ufileformat",CFG_ENTRY_STRING,256,ginfo->m3ufileformat},\ + {"delete_wavs",CFG_ENTRY_BOOL,0,&ginfo->delete_wavs},\ +@@ -863,6 +865,7 @@ + #endif + ginfo->in_rip_thread=FALSE; + strcpy(ginfo->ripfileformat,"~/mp3/%A/%d/%n.wav"); ++ strcpy(ginfo->ripfileformat_multi,"~/mp3/%A/%d/%a - %n.wav"); + #ifdef __linux__ + FindExeInPath("cdparanoia", ginfo->ripexename, sizeof(ginfo->ripexename)); + strcpy(ginfo->ripcmdline,"-d %c %t:[.%s]-%t:[.%e] %w"); +@@ -889,6 +892,7 @@ + strcpy(ginfo->mp3cmdline,"-h -b %b %w %m"); + FindExeInPath("lame", ginfo->mp3exename, sizeof(ginfo->mp3exename)); + strcpy(ginfo->mp3fileformat,"~/mp3/%A/%d/%n.%x"); ++ strcpy(ginfo->mp3fileformat_multi,"~/mp3/%A/%d/%a - %n.%x"); + strcpy(ginfo->mp3extension,"mp3"); + ginfo->mp3nice=0; + *ginfo->mp3_filter_cmd='\0'; +@@ -946,9 +950,19 @@ + + strcpy(filename,outputdir); + MakePath(filename); ++ strcat(filename,ginfo->mp3fileformat_multi); ++ strcpy(ginfo->mp3fileformat_multi,filename); ++ ++ strcpy(filename,outputdir); ++ MakePath(filename); + strcat(filename,ginfo->ripfileformat); + strcpy(ginfo->ripfileformat,filename); + ++ strcpy(filename,outputdir); ++ MakePath(filename); ++ strcat(filename,ginfo->ripfileformat_multi); ++ strcpy(ginfo->ripfileformat_multi,filename); ++ + *outputdir='\0'; + } + #endif +--- a/src/gripcfg.c ++++ b/src/gripcfg.c +@@ -271,6 +271,11 @@ + gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0); + gtk_widget_show(entry); + ++ entry=MakeStrEntry(NULL,ginfo->ripfileformat_multi, ++ _("Rip file format (Multi-artist)"),255,TRUE); ++ gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0); ++ gtk_widget_show(entry); ++ + entry=MakeStrEntry(NULL,ginfo->force_scsi,_("Generic SCSI device"), + 255,TRUE); + gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0); +@@ -428,6 +433,12 @@ + 255,TRUE); + gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0); + gtk_widget_show(entry); ++ ++ entry=MakeStrEntry(NULL,ginfo->mp3fileformat_multi, ++ _("Encode file format (Multi-artist)"), ++ 255,TRUE); ++ gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0); ++ gtk_widget_show(entry); + + gtk_container_add(GTK_CONTAINER(page2),vbox); + gtk_widget_show(vbox); +--- a/src/grip.h ++++ b/src/grip.h +@@ -296,6 +296,7 @@ + #endif + char ripexename[256]; + char ripfileformat[256]; ++ char ripfileformat_multi[256]; + char ripcmdline[256]; + int ripnice; + int max_wavs; +@@ -312,6 +313,7 @@ + char mp3cmdline[256]; + char mp3extension[10]; + char mp3fileformat[256]; ++ char mp3fileformat_multi[256]; + char mp3exename[256]; + gboolean delete_wavs; + gboolean add_to_db; +--- a/src/rip.c ++++ b/src/rip.c +@@ -342,6 +342,7 @@ + int track; + EncodeTrack enc_track; + GString *str; ++ char *format; + + ginfo=(GripInfo *)data; + +@@ -351,8 +352,11 @@ + FillInTrackInfo(ginfo,track,&enc_track); + + str=g_string_new(NULL); +- +- TranslateString(ginfo->mp3fileformat,str,TranslateSwitch, ++ ++ format = (ginfo->ddata.data_multi_artist) ++ ? ginfo->mp3fileformat_multi ++ : ginfo->mp3fileformat; ++ TranslateString(format,str,TranslateSwitch, + &enc_track,TRUE,&(ginfo->sprefs)); + + g_snprintf(enc_track.mp3_filename,256,"%s",str->str); +@@ -576,6 +580,7 @@ + GString *str; + char *conv_str; + gsize rb,wb; ++ char *format; + + if(!ginfo->have_disc) return FALSE; + +@@ -610,7 +615,10 @@ + g_string_truncate(str,0); + + FillInTrackInfo(ginfo,i,&enc_track); +- TranslateString(ginfo->mp3fileformat,str,TranslateSwitch, ++ format = (ginfo->ddata.data_multi_artist) ++ ? ginfo->mp3fileformat_multi ++ : ginfo->mp3fileformat; ++ TranslateString(format,str,TranslateSwitch, + &enc_track,TRUE,&(ginfo->sprefs)); + + conv_str=g_filename_from_utf8(str->str,strlen(str->str),&rb,&wb,NULL); +@@ -1379,6 +1387,7 @@ + char *conv_str, *utf8_ripfile; + gsize rb,wb; + const char *charset; ++ char *format; + + uinfo=&(ginfo->gui_info); + +@@ -1427,7 +1436,10 @@ + str=g_string_new(NULL); + FillInTrackInfo(ginfo,ginfo->rip_track,&enc_track); + +- TranslateString(ginfo->ripfileformat,str,TranslateSwitch, ++ format = (ginfo->ddata.data_multi_artist) ++ ? ginfo->ripfileformat_multi ++ : ginfo->ripfileformat; ++ TranslateString(format,str,TranslateSwitch, + &enc_track,TRUE,&(ginfo->sprefs)); + + g_get_charset(&charset); +@@ -1670,6 +1682,7 @@ + int cpu; + char *conv_str; + gsize rb,wb; ++ char *format; + + uinfo=&(ginfo->gui_info); + +@@ -1700,7 +1713,10 @@ + + str=g_string_new(NULL); + +- TranslateString(ginfo->mp3fileformat,str,TranslateSwitch, ++ format = (ginfo->ddata.data_multi_artist) ++ ? ginfo->mp3fileformat_multi ++ : ginfo->mp3fileformat; ++ TranslateString(format,str,TranslateSwitch, + enc_track,TRUE,&(ginfo->sprefs)); + + conv_str=g_filename_from_utf8(str->str,strlen(str->str),&rb,&wb,NULL); diff -Nru grip-3.3.1/debian/patches/grip-3.3.1_warnings.patch grip-3.3.1/debian/patches/grip-3.3.1_warnings.patch --- grip-3.3.1/debian/patches/grip-3.3.1_warnings.patch 1970-01-01 00:00:00.000000000 +0000 +++ grip-3.3.1/debian/patches/grip-3.3.1_warnings.patch 2013-04-08 10:04:45.000000000 +0000 @@ -0,0 +1,55 @@ +fix a bunch of warnings from GCC 4.4 + +--- a/src/discdb.c ++++ b/src/discdb.c +@@ -45,10 +45,10 @@ + #include "config.h" + + extern char *Program; +-static char *StrConvertEncoding(char *str,char *from,char *to,int max_len); ++static char *StrConvertEncoding(char *str,char const*from,char *to,int max_len); + gboolean DiscDBUTF8Validate(const DiscInfo *disc,const DiscData *data); + static void DiscDBConvertEncoding(DiscInfo *disc,DiscData *data, +- char *from,char *to); ++ char const*from,char *to); + static int DiscDBSum(int val); + static char *DiscDBReadLine(char **dataptr); + static GString *DiscDBMakeURI(DiscDBServer *server,DiscDBHello *hello, +@@ -496,7 +496,7 @@ + } + } + +-static char *StrConvertEncoding(char *str,char *from,char *to,int max_len) ++static char *StrConvertEncoding(char *str,char const*from,char *to,int max_len) + { + char *conv_str; + gsize rb,wb; +@@ -541,7 +541,7 @@ + + + static void DiscDBConvertEncoding(DiscInfo *disc,DiscData *data, +- char *from,char *to) ++ char const*from,char *to) + { + int track; + +--- a/src/status_window.c ++++ b/src/status_window.c +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/src/tray.c ++++ b/src/tray.c +@@ -21,6 +21,7 @@ + */ + + #include "tray.h" ++#include "common.h" + #include "../pixmaps/rip1.xpm" + #include "../pixmaps/menuplay.xpm" + #include "../pixmaps/menupause.xpm" diff -Nru grip-3.3.1/debian/patches/patch-src_launch_c grip-3.3.1/debian/patches/patch-src_launch_c --- grip-3.3.1/debian/patches/patch-src_launch_c 1970-01-01 00:00:00.000000000 +0000 +++ grip-3.3.1/debian/patches/patch-src_launch_c 2013-04-08 10:09:25.000000000 +0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- a/src/launch.c ++++ b/src/launch.c +@@ -261,7 +261,7 @@ + char *new_str; + GString *new_arg; + int pos; +- int len; ++ gsize len; + + for(pos=1;args[pos];pos++) { + new_str=g_locale_from_utf8(args[pos]->str,-1,NULL,&len,NULL); diff -Nru grip-3.3.1/debian/patches/series grip-3.3.1/debian/patches/series --- grip-3.3.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ grip-3.3.1/debian/patches/series 2013-04-08 10:06:51.000000000 +0000 @@ -0,0 +1,6 @@ +add_codec_configs +cdrom_audio_invalid +grip-3.3.1_multi.patch +grip-3.3.1_warnings.patch +grip-3.3.1-invalid-genre-size.patch +patch-src_launch_c diff -Nru grip-3.3.1/debian/pixmaps/grip.xpm grip-3.3.1/debian/pixmaps/grip.xpm --- grip-3.3.1/debian/pixmaps/grip.xpm 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/pixmaps/grip.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,347 +0,0 @@ -/* XPM */ -static char * grip_xpm[] = { -"32 32 312 2", -" c None", -". c #E7455B", -"+ c #EF7F8E", -"@ c #EF5569", -"# c #EA3A50", -"$ c #EC2C44", -"% c #E9324A", -"& c #E9334A", -"* c #EA2F47", -"= c #EE6274", -"- c #F07484", -"; c #F04B61", -"> c #F07283", -", c #ED4F64", -"' c #EE5367", -") c #ED5C70", -"! c #F05C6F", -"~ c #EF576C", -"{ c #EF576B", -"] c #F05A6E", -"^ c #EF697B", -"/ c #EE6A7C", -"( c #E6273F", -"_ c #F38795", -": c #ED4156", -"< c #F16C7F", -"[ c #EF5B70", -"} c #EF6275", -"| c #EF6577", -"1 c #ED455A", -"2 c #EF2A42", -"3 c #F14A5F", -"4 c #F496A2", -"5 c #EA475C", -"6 c #F28291", -"7 c #ED384F", -"8 c #F1687B", -"9 c #EF5B6F", -"0 c #F03A52", -"a c #F07284", -"b c #EF596D", -"c c #F0697A", -"d c #EF6879", -"e c #EE5A6D", -"f c #F16F81", -"g c #ED5166", -"h c #EE3A52", -"i c #F06E80", -"j c #F0445B", -"k c #F38796", -"l c #EB4B5F", -"m c #F28896", -"n c #EC3D54", -"o c #EF3C52", -"p c #EE6174", -"q c #EF687B", -"r c #EF4C62", -"s c #EE4D61", -"t c #F17C8C", -"u c #ED5769", -"v c #F3808F", -"w c #EC4257", -"x c #F17888", -"y c #EB384F", -"z c #ED5469", -"A c #EE6E7E", -"B c #EC5B6E", -"C c #F37686", -"D c #EC2942", -"E c #EE495D", -"F c #EC6C7D", -"G c #EF6C7E", -"H c #F37D8C", -"I c #F2919E", -"J c #E44157", -"K c #F06B7D", -"L c #EA273F", -"M c #E81D35", -"N c #F5909D", -"O c #ED394F", -"P c #EE364D", -"Q c #F27283", -"R c #F48392", -"S c #F38291", -"T c #F08492", -"U c #F27D8C", -"V c #EE6778", -"W c #EA4F62", -"X c #EE485D", -"Y c #EA253E", -"Z c #EC3E55", -"` c #EF6174", -" . c #E73D53", -".. c #EF7080", -"+. c #F27A89", -"@. c #EE243E", -"#. c #EB5064", -"$. c #EB4E62", -"%. c #EC4F63", -"&. c #ED5E70", -"*. c #F17A8A", -"=. c #EA4D61", -"-. c #ED5065", -";. c #EA4257", -">. c #EA3048", -",. c #EF6376", -"'. c #F26074", -"). c #F05D70", -"!. c #E22B43", -"~. c #EA3349", -"{. c #EF586C", -"]. c #F1697B", -"^. c #F07989", -"/. c #F38392", -"(. c #F37B8A", -"_. c #F1697A", -":. c #F26A7B", -"<. c #ED6D7E", -"[. c #F06477", -"}. c #EA4359", -"|. c #EF5368", -"1. c #E23249", -"2. c #EF8191", -"3. c #EF6E7F", -"4. c #EF5266", -"5. c #EF485E", -"6. c #EF3D54", -"7. c #EB5C6F", -"8. c #F16577", -"9. c #EB384D", -"0. c #EB4C61", -"a. c #EF4B61", -"b. c #D15073", -"c. c #D86683", -"d. c #D42C50", -"e. c #ED5367", -"f. c #E93D53", -"g. c #E74259", -"h. c #EE7084", -"i. c #E9566E", -"j. c #D35C7E", -"k. c #9D6F9E", -"l. c #8473A9", -"m. c #EA5D70", -"n. c #EB435A", -"o. c #E5566E", -"p. c #B25A87", -"q. c #A36497", -"r. c #5482C6", -"s. c #4599DC", -"t. c #D74666", -"u. c #E5556C", -"v. c #D46F8D", -"w. c #835391", -"x. c #4E91DD", -"y. c #50A4EB", -"z. c #3598EE", -"A. c #228BE7", -"B. c #228BE4", -"C. c #3488DA", -"D. c #5177C6", -"E. c #4070C0", -"F. c #267ED8", -"G. c #2084D9", -"H. c #1583E9", -"I. c #208AE4", -"J. c #258DEA", -"K. c #3697EC", -"L. c #56A1E7", -"M. c #588CD4", -"N. c #A66595", -"O. c #C74B70", -"P. c #936AA0", -"Q. c #8CB3E3", -"R. c #9AC9F2", -"S. c #81BEF2", -"T. c #86C2F3", -"U. c #93C7F2", -"V. c #67B2EE", -"W. c #1C87E8", -"X. c #83BEEF", -"Y. c #95CAF4", -"Z. c #419AE4", -"`. c #469EEB", -" + c #6DB3EA", -".+ c #1E8CED", -"++ c #61AEED", -"@+ c #9ACAF4", -"#+ c #86C0F2", -"$+ c #87BEF0", -"%+ c #9ECBF2", -"&+ c #87A5D8", -"*+ c #5E77C0", -"=+ c #6A9DDB", -"-+ c #A9CFF3", -";+ c #6C91D4", -">+ c #4B7ED3", -",+ c #3E98EC", -"'+ c #9FCEF6", -")+ c #80BFF4", -"!+ c #218CED", -"~+ c #A0CEF5", -"{+ c #69B3F4", -"]+ c #1E8DF2", -"^+ c #56A7F0", -"/+ c #87C0F0", -"(+ c #228FF1", -"_+ c #79BBF3", -":+ c #91C6F4", -"<+ c #498EE1", -"[+ c #6174C1", -"}+ c #6F94D5", -"|+ c #AAD1F4", -"1+ c #5996DE", -"2+ c #7EB7F0", -"3+ c #95BEEB", -"4+ c #8385C2", -"5+ c #935591", -"6+ c #4571CD", -"7+ c #74B4EE", -"8+ c #86C2F5", -"9+ c #9BCBF5", -"0+ c #46A2F2", -"a+ c #57A8F0", -"b+ c #89C1F0", -"c+ c #238FF1", -"d+ c #7BBBF3", -"e+ c #67A4E7", -"f+ c #6767B4", -"g+ c #A573A5", -"h+ c #7B77B9", -"i+ c #8DC3F3", -"j+ c #6FB3F1", -"k+ c #75B7EF", -"l+ c #9FC5EE", -"m+ c #7182C6", -"n+ c #967DB6", -"o+ c #616FBC", -"p+ c #8CC1F1", -"q+ c #85C0F4", -"r+ c #248BEB", -"s+ c #9ACBF4", -"t+ c #56A8F0", -"u+ c #58A7EE", -"v+ c #88C1F0", -"w+ c #288BEC", -"x+ c #7CBAF1", -"y+ c #7DB0E8", -"z+ c #7880C3", -"A+ c #8F78B4", -"B+ c #5474C4", -"C+ c #A2CFF5", -"D+ c #5AAAF0", -"E+ c #8CC5F4", -"F+ c #90C3F1", -"G+ c #71A4E1", -"H+ c #7FB9EE", -"I+ c #B3D7F7", -"J+ c #83B9EE", -"K+ c #387FD6", -"L+ c #8BC1EE", -"M+ c #5189D5", -"N+ c #605DAD", -"O+ c #5F97DA", -"P+ c #78B6EB", -"Q+ c #4480D5", -"R+ c #7AB3EB", -"S+ c #A4D0F6", -"T+ c #7EB6EC", -"U+ c #6FA6E4", -"V+ c #95C6F2", -"W+ c #8DC6F2", -"X+ c #2D91EA", -"Y+ c #59A9EF", -"Z+ c #64AFEF", -"`+ c #52A2ED", -" @ c #8EC3F3", -".@ c #82B0E5", -"+@ c #6778BD", -"@@ c #709BD4", -"#@ c #7E81B9", -"$@ c #A46EA0", -"%@ c #7889C0", -"&@ c #6690CB", -"*@ c #657DC3", -"=@ c #89B8E9", -"-@ c #82BBF0", -";@ c #5CA6EC", -">@ c #6BB2EF", -",@ c #5FACEF", -"'@ c #5AB0EF", -")@ c #5FADF1", -"!@ c #3D99EE", -"~@ c #58A7EF", -"{@ c #9BCBF4", -"]@ c #5C92D6", -"^@ c #8C5390", -"/@ c #AA4F7E", -"(@ c #C35D7F", -"_@ c #CD5F7D", -":@ c #BA5179", -"<@ c #9E4B80", -"[@ c #6369B3", -"}@ c #78B0E8", -"|@ c #5CA6E8", -"1@ c #59AAEC", -"2@ c #72B7F2", -"3@ c #84C0F4", -"4@ c #7BBCF3", -"5@ c #4AA0EB", -"6@ c #338FDD", -"7@ c #2786D6", -" ", -" ", -" ", -" ", -" . + @ # ", -" $ % & * = - ; > , ", -" ' ' ) ! ~ { ] ^ / ( _ : < [ ", -" } | 1 2 3 4 5 6 7 8 9 ", -" 0 a b c d > e f g ", -" h i j k l m n o p ", -" q r s t u v w x y ", -" z < A B - C D E F G H I J ", -" K L M N O P Q R S T U V W X Y ", -" Z ` ...+. @.#.$.%.&.*.=. ", -" -.;. >.,.'.).!.~.{.].^./.(._.:.<. ", -" [.y }.|. 1.2.3.4.5. 6.7. ", -" 8.9. 0.a. b.c.d. 7. ", -" e.f. g.h.i.j.k.l. m. ", -" n.o. p.q.r.s. t.u. ", -" v.w.x.y.z.A.B. C.D.E.F.G.H.I.J.K.L.M.N.O. ", -" P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+ ", -" =+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+ ", -" 2+3+4+5+6+7+8+!+9+0+ a+b+c+d+e+f+g+h+i+j+ ", -" k+l+m+n+o+p+q+r+s+t+ u+v+w+x+y+z+A+B+C+D+ ", -" E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+ ", -" X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@ ", -" '@)@!@~@{@]@^@/@(@_@:@<@[@}@|@ ", -" 1@2@3@4@5@ 6@7@ ", -" ", -" ", -" ", -" "}; diff -Nru grip-3.3.1/debian/rules grip-3.3.1/debian/rules --- grip-3.3.1/debian/rules 2013-04-08 13:36:13.000000000 +0000 +++ grip-3.3.1/debian/rules 2013-04-08 13:22:08.000000000 +0000 @@ -1,78 +1,12 @@ #!/usr/bin/make -f -include /usr/share/dpatch/dpatch.make +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +%: + dh $@ -ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) - CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc -else - CROSS= -endif - -ifeq ($(ARCH),alpha) - CFLAGS += -mieee -endif - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp - rm -f config.guess config.sub - - [ ! -f Makefile ] || $(MAKE) distclean - rm -f po/*.gmo - - dh_clean - -config.status: configure patch-stamp - dh_testdir - -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - - CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --with-gnome - -build: build-stamp -build-stamp: config.status - dh_testdir - - $(MAKE) - - touch build-stamp - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - $(MAKE) DESTDIR=$(CURDIR)/debian/grip install - -binary: binary-arch - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_install - dh_installmenu - dh_installman - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: - -.PHONY: clean build install binary binary-arch binary-indep +override_dh_auto_clean: + dh_auto_clean + rm -f po/grip-*.pot + diff -Nru grip-3.3.1/debian/source/format grip-3.3.1/debian/source/format --- grip-3.3.1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ grip-3.3.1/debian/source/format 2013-04-08 13:36:13.906467936 +0000 @@ -0,0 +1 @@ +3.0 (quilt)