debian/0000755000000000000000000000000012516103176007170 5ustar debian/patches/0000755000000000000000000000000012516103066010615 5ustar debian/patches/0003-Apply-patch-from-Michael-fixing-TypeError-when-calli.patch0000644000000000000000000000432512510675054024146 0ustar From f63be1f82100484b958dc85f63daf63a506d3ae8 Mon Sep 17 00:00:00 2001 From: kassoulet Date: Sun, 10 Feb 2013 21:05:51 +0100 Subject: [PATCH 3/3] Apply patch from Michael fixing TypeError when calling show_error. Closes lp:1121164, thanks Michael. --- soundconverter/gstreamer.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/soundconverter/gstreamer.py b/soundconverter/gstreamer.py index 14b0810..98d8e03 100644 --- a/soundconverter/gstreamer.py +++ b/soundconverter/gstreamer.py @@ -187,7 +187,7 @@ class Pipeline(BackgroundTask): return self.done() if result == gst.pbutils.INSTALL_PLUGINS_USER_ABORT: - show_error(_('Plugin installation aborted.')) + show_error('Error', _('Plugin installation aborted.')) return show_error('Error', 'failed to install plugins: %s' % gobject.markup_escape_text(str(result))) @@ -353,6 +353,8 @@ class Decoder(Pipeline): self.sound_file.duration = self.pipeline.query_duration( gst.FORMAT_TIME)[0] / gst.SECOND debug('got file duration:', self.sound_file.duration) + if self.sound_file.duration < 0: + self.sound_file.duration = None except gst.QueryError: self.sound_file.duration = None @@ -522,7 +524,7 @@ class Converter(Decoder): if not encoder: # TODO: is this used ? # TODO: add proper error management when an encoder cannot be created - show_error(_("Cannot create a decoder for \'%s\' format.") % + show_error(_('Error', "Cannot create a decoder for \'%s\' format.") % self.output_type) return @@ -533,7 +535,7 @@ class Converter(Decoder): if dirname and not gnomevfs.exists(dirname): log('Creating folder: \'%s\'' % dirname) if not vfs_makedirs(str(dirname)): - show_error(_("Cannot create \'%s\' folder.") % dirname) + show_error('Error', _("Cannot create \'%s\' folder.") % dirname) return self.add_command('%s location="%s"' % ( -- 1.9.1 debian/patches/series0000644000000000000000000000033412516103066012032 0ustar 0003-Apply-patch-from-Michael-fixing-TypeError-when-calli.patch 0002-Apply-patch-from-Michael.-Empty-task-queue-when-abor.patch 0001-Missing-plugins-handling-ignore-video-codecs.patch 0004-Fix-debug-local-aliasing.patch debian/patches/0001-Missing-plugins-handling-ignore-video-codecs.patch0000644000000000000000000000303412510675054022716 0ustar From c12eef38dc9740d62452a094b1b8e9db03858b65 Mon Sep 17 00:00:00 2001 From: kassoulet Date: Fri, 13 Feb 2015 23:47:23 +0100 Subject: [PATCH 1/3] Missing plugins handling: ignore video codecs. This seems to fix the forever-loop in Ubuntu 14.04 while converting videos. Fix lp:1308187, thanks Thibaut. --- soundconverter/gstreamer.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/soundconverter/gstreamer.py b/soundconverter/gstreamer.py index ee61155..14b0810 100644 --- a/soundconverter/gstreamer.py +++ b/soundconverter/gstreamer.py @@ -208,11 +208,15 @@ class Pipeline(BackgroundTask): elif t == gst.MESSAGE_ELEMENT: st = message.structure if st and st.get_name().startswith('missing-'): - self.pipeline.set_state(gst.STATE_NULL) if gst.pygst_version >= (0, 10, 10): import gst.pbutils detail = gst.pbutils.\ missing_plugin_message_get_installer_detail(message) + mime_type = detail.split('|')[4].split(', ')[0] + if 'video' in mime_type: + debug('ignoring video codec: ', mime_type) + return True + self.pipeline.set_state(gst.STATE_NULL) ctx = gst.pbutils.InstallPluginsContext() gst.pbutils.install_plugins_async([detail], ctx, self.install_plugin_cb) -- 1.9.1 debian/patches/0004-Fix-debug-local-aliasing.patch0000644000000000000000000000143312516103066016707 0ustar From ee70279a4daa70de2e693795c85d0276ccb0ec2d Mon Sep 17 00:00:00 2001 From: kassoulet Date: Fri, 17 Apr 2015 14:16:10 +0200 Subject: [PATCH] Fix debug() local aliasing. --- soundconverter/gstreamer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soundconverter/gstreamer.py b/soundconverter/gstreamer.py index 98d8e03..8a86968 100644 --- a/soundconverter/gstreamer.py +++ b/soundconverter/gstreamer.py @@ -200,7 +200,7 @@ class Pipeline(BackgroundTask): t = message.type import gst if t == gst.MESSAGE_ERROR: - error, debug = message.parse_error() + error, debug_info = message.parse_error() self.eos = True self.on_error(error) self.done() -- 1.9.1 debian/patches/0002-Apply-patch-from-Michael.-Empty-task-queue-when-abor.patch0000644000000000000000000000152112510675054024020 0ustar From e6a48f44779119c8c6a314e72a1f20a29a117b04 Mon Sep 17 00:00:00 2001 From: kassoulet Date: Sun, 10 Feb 2013 23:57:13 +0100 Subject: [PATCH 2/3] Apply patch from Michael. Empty task queue when aborting. Closes lp:1121297, thanks Michael. --- soundconverter/ui.py | 1 + 1 file changed, 1 insertion(+) diff --git a/soundconverter/ui.py b/soundconverter/ui.py index fb753ac..5cf8517 100644 --- a/soundconverter/ui.py +++ b/soundconverter/ui.py @@ -1430,6 +1430,7 @@ class SoundConverterWindow(GladeWindow): self.filelist.hide_row_progress() self.status_frame.show() self.widget.set_sensitive(True) + self.converter.abort() try: from gi.repository import Unity launcher = Unity.LauncherEntry.get_for_desktop_id ("soundconverter.desktop") -- 1.9.1 debian/rules0000755000000000000000000000005512053277210010245 0ustar #!/usr/bin/make -f %: dh $@ --with=python2 debian/source/0000755000000000000000000000000012510675550010474 5ustar debian/source/format0000644000000000000000000000001412053277210011673 0ustar 3.0 (quilt) debian/copyright0000644000000000000000000000245112053277210011122 0ustar Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=48 Name: soundconverter Contact: Gautier Portet Source: http://soundconverter.berlios.de/ Files: * Copyright: 2004, Lars Wirzenius 2005-2008, Gautier Portet License: GPL-3 On Debian systems the full text of the GNU General Public License can be found in the `/usr/share/common-licenses/GPL-3' file. Files: debian/* Copyright: 2006-2008, William Grant 2009, Jason Heeris License: GPL-3 On Debian systems the full text of the GNU General Public License can be found in the `/usr/share/common-licenses/GPL-3' file. Copyright and acknowledgements ------------------------------ Copyright 2004 Lars Wirzenius Copyright 2005-2008 Gautier Portet 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; version 3 of the License. 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. debian/control0000644000000000000000000000177612053277303010606 0ustar Source: soundconverter Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Lars Wirzenius Section: gnome Priority: optional Build-Depends: debhelper (>= 9.20120115), python (>= 2.6.3-3) Build-Depends-Indep: python-gtk2, python-gnome2, intltool, gettext, libexpat1 Standards-Version: 3.9.2 X-Python-Version: >= 2.6 Homepage: http://soundconverter.org/ Package: soundconverter Architecture: all Depends: ${misc:Depends}, python, python-gnome2, python-glade2, python-gst0.10, gstreamer0.10-plugins-good, gstreamer0.10-plugins-base Suggests: gstreamer0.10-plugins-ugly, gstreamer0.10-ffmpeg Description: GNOME application to convert audio files into other formats SoundConverter is a simple sound converter application for the GNOME environment. It reads sound files in any format supported by GStreamer and outputs them in Ogg Vorbis, FLAC, or WAV format, or MP3 format if you have the GStreamer LAME plugin. debian/changelog0000644000000000000000000002535612516103166011054 0ustar soundconverter (2.0.4-0ubuntu1.2) trusty; urgency=low * Fix debug() local aliasing. (LP: #1423709) -- Michele Giacomoli Fri, 17 Apr 2015 14:40:37 +0200 soundconverter (2.0.4-0ubuntu1.1) trusty; urgency=low * New upstream stable branch bug fixes (LP: #1423709). - Ignore video codecs (LP: #1308187). Thanks to Thibaut - Empty task queue when aborting. Thanks to Michael. - Fix TypeError when calling show_error. Thanks to Michael -- Michele Giacomoli Tue, 07 Apr 2015 00:45:43 +0200 soundconverter (2.0.4-0ubuntu1) raring; urgency=low * New upstream release (LP: #1077508). - Disable common path when creating folders using tags (LP: #972158). - Increase Low pass filter frequency when converting to MP3 (LP: #881413). - Use original filename as title when tags are not present (LP: #984790). - Fix command line arguments parsing (LP: #995862). - Fix problem with AAC settings (LP: #954555). - Fix yet another problem with URIs handling (LP: #998371). -- Logan Rosen Wed, 21 Nov 2012 12:38:13 -0500 soundconverter (2.0.1-1) unstable; urgency=low * New upstream version. * debian/compat: Bump to 9. * debian/control: Bump Build-Depends on debhelper to current version. * debian/rules: Remove all customization. -- Lars Wirzenius Wed, 22 Feb 2012 21:58:39 +0000 soundconverter (1.5.4-1) unstable; urgency=low * New upstream version. This should fix the following bugs in Debian: - soundconverter stops converting m4a files sudently.. (Closes: #468846) - should depend on package gstreamer0.10-lame (Closes: #571521) - please support gnome audio profiles (Closes: #500239) - please package new version (Closes: #606764) * New Debian package maintainer. Thanks, Jason Heeris, for the previous uploads. * Removed debian/patches: the only patch is no longer required. * Removed debian/watch: it didn't work after upstream moved from Berlios, and I can't be bothered. (I would prefer watch files to be maintained in a central location, and not require packaging updates when upstream moves.) * Packaging re-done to use dh. -- Lars Wirzenius Sat, 26 Nov 2011 12:14:13 +0000 soundconverter (1.4.4-2) unstable; urgency=low * Changed copyright information. * Removed dependency on gstreamer0.10-gnomevfs. Closes: #546451 -- Jason Heeris Sun, 13 Sep 2009 20:08:13 +0800 soundconverter (1.4.4-1) unstable; urgency=low * New upstream release. (Closes: #524455) * Updated watch file (gz => bz2). * Included "get-orig-source" target. -- Jason Heeris Sun, 30 Aug 2009 18:28:42 +0800 soundconverter (1.3.1-1) unstable; urgency=low * New upstream release. (Closes: #482772) - Can run multiple jobs simultaneously. (Closes: #401148) * Sync from Ubuntu. * Acknowledge NMU, thanks Ben. * debian/patches/100_dont_overwrite_source.diff: Drop. New upstream version includes it. * debian/control: - Update standards version to 3.8.0. No other changes were required. - Update maintainer email address. * debian/copyright: Update years and emails, and mention GPL3ing of the packaging. -- William Grant Sat, 26 Jul 2008 18:16:59 +1000 soundconverter (1.2.0-0ubuntu1) intrepid; urgency=low * New upstream release. - Reset progress indiciator after a conversion. (LP: #104450) * debian/patches/fix-add_uris-crash.patch: Drop. Included upstream. -- William Grant Wed, 04 Jun 2008 13:38:33 +1000 soundconverter (1.0.1-0ubuntu2) hardy; urgency=low * debian/patches/fix-add_uris-crash.patch: Don't crash on an invalid URI. Backported from 1.0.2. (LP: #211210) -- William Grant Tue, 22 Apr 2008 22:08:07 +1000 soundconverter (1.0.1-0ubuntu1) hardy; urgency=low * New upstream release. - Fix crasher with unicode filenames. (LP: #212730) - Fix crasher when removing messy unicode chars. (LP: #216119) -- William Grant Mon, 21 Apr 2008 23:27:33 +1000 soundconverter (1.0.0-0ubuntu1) hardy; urgency=low * New upstream release. - Only format tags when displaying. (LP: #179886) - Fix filename_to_uri to remove gvfs error at startup. (LP: #208794) -- William Grant Mon, 07 Apr 2008 09:15:41 +1000 soundconverter (0.9.9-0ubuntu1) hardy; urgency=low * New upstream release. (LP: #208544) -- William Grant Sat, 29 Mar 2008 10:07:55 +1100 soundconverter (0.9.8-0ubuntu1) hardy; urgency=low * New upstream release. (LP: #181611) * debian/control: - Depend on gstreamer0.10-plugins-base. (LP: #154617) - Don't Suggest gstreamer0.10-lame. It's not in an official repository. - Bump Standards-Version to 3.7.3. - Migrate to official Homepage field. * debian/patches/fix-desktop-file.patch: Drop Encoding and duplicate Name fields from soundconverter.desktop. -- William Grant Thu, 10 Jan 2008 18:55:34 +1100 soundconverter (0.9.7-1.1) unstable; urgency=low * Non-maintainer upload. * Add dependency on gstreamer0.10-plugins-base. (Closes: #487045) * Apply upstream change to prevent overwriting source file. (Closes: #461526) * Convert Homepage to a real control field. -- Ben Hutchings Sun, 29 Jun 2008 18:03:11 +0000 soundconverter (0.9.7-1) unstable; urgency=low * New upstream release. - License is now GPLv3. - Better replace-messy-chars. (Closes: #401147) * Update debian/copyright for new license. -- William Grant Thu, 02 Aug 2007 11:16:36 +1000 soundconverter (0.9.6-1) unstable; urgency=low * Merge from Ubuntu. - Proper upstream patch to fix URL-encoding and space mangling. (Closes: #423158) -- William Grant Thu, 17 May 2007 16:33:25 +1000 soundconverter (0.9.6-0ubuntu1) gutsy; urgency=low * New upstream release - Don't write to URL-encoded filenames (LP: #109365) * debian/copyright: Update. * debian/watch: Add. * debian/control: Add python-gnome2 to build-depends, as configure wants it. * debian/patches/01_add_desktop_icon.patch: Drop, now included upstream. -- William Grant Sun, 29 Apr 2007 08:22:10 +1000 soundconverter (0.9.4-2) unstable; urgency=low * Add upstream patch to stop URL-encoding of output filenames. (Closes: #415771) * debian/watch: Add. -- William Grant Mon, 16 Apr 2007 20:23:57 +1000 soundconverter (0.9.4-1) unstable; urgency=low * Merge from Ubuntu. - Link to instructions for MP3 support. (Closes: 398188) * Update Maintainer address. * Update description to match .desktop. * Add gstreamer0.10-{lame,ffmpeg} to Suggests. -- William Grant Fri, 2 Mar 2007 10:07:57 +1100 soundconverter (0.9.4-0ubuntu1) feisty; urgency=low * New upstream release. - Don't crash on special characters such as spaces (LP: #87768) - Create VBR MP3s with proper length (LP: #87715) - Display an error with link to a howto when codec is missing (LP: #41457) * Don't copy the logo into /usr/share/pixmaps for use as an icon; upstream now supplies a proper one. * Fix up .desktop: - Clarify GenericName. - Change Icon to respect new upstream logo. - Add semicolon to end of Categories. -- William Grant Fri, 2 Mar 2007 07:49:34 +1100 soundconverter (0.9.3-1ubuntu1) feisty; urgency=low * Fix 01_add_desktop_icon.patch to modify soundconverter.desktop.in.in, rather than soundconverter.desktop or soundconverter.desktop.in. (Closes Launchpad #70019) * Symlink the icon into /usr/share/pixmaps. * Partially HIGify (and fix a spelling mistake in) the .desktop. -- William Grant Wed, 31 Jan 2007 23:25:03 +1100 soundconverter (0.9.3-1) unstable; urgency=low * New upstream release * Set menu icon. It's not square, but it's there. (Closes: #395458) -- William Alexander Grant Mon, 6 Nov 2006 17:45:02 +1100 soundconverter (0.9.2-1) unstable; urgency=low * New upstream release -- William Alexander Grant Mon, 16 Oct 2006 17:44:21 +1000 soundconverter (0.9.1-1) unstable; urgency=low * New upstream release. - Change gstreamer0.8* dependencies to the equivalent gstreamer0.10 ones (Closes: #380473). - Drop the Debian .desktop, as there's now one included upstream. - Use CDBS, as the new upstream uses autotools. - Add python-gtk2 to Build-Depends-Indep, due to autotools detection. * Bumped debhelper dependency to >= 5. * New maintainer. -- William Alexander Grant Sun, 24 Sep 2006 23:17:02 +1000 soundconverter (0.8.7-2) unstable; urgency=low * debian/control: Added missing dependency gstreamer0.8-gnomevfs. Thanks, Martin Schulze. Closes: #382279. * soundconverter.py: Changed the charset declaration from "latin-1" to "iso-8859-1". Thanks, Mario Iseli. Closes: #385181. * debian/control: Added an XS-Python-Version header. -- Lars Wirzenius Wed, 30 Aug 2006 14:00:59 +0300 soundconverter (0.8.7-1) unstable; urgency=low * New upstream release. Fixes these bugs reported to Debian: - "-t flag doesn't work" (Close: #370724) * Fix translations so that all languages are not French (or its bastard child, English). (Closes: #378479) * debian/control: Added a Build-Depends-Indep for gettext and libexpat1 (so that xgettext works on glade files), since we now use xgettext in the build. -- Lars Wirzenius Sun, 30 Jul 2006 14:20:14 +0300 soundconverter (0.8.6-1) unstable; urgency=low * New upstream version. (Skipped a couple of them. People nag at me too little.) Fixes Debian bug: - "doesn't load any mp3/ogg input file" (Closes: #367253) * debian/control: Bumped Standards-Version, no other changes needed for this. -- Lars Wirzenius Fri, 14 Jul 2006 21:37:06 +0300 soundconverter (0.8.3-1) unstable; urgency=low * New upstream version. Closes: #356183. * debian/control: "Depends" on gstreamer0.8-mad added, so that decoding MP3 will work. * debian/control: "Suggests" on gstreamer0.8-lame added, so that encoding to MP3 will work. The package is not provided by Debian, but it exists in a fairly popular inofficial repository by Marillat. -- Lars Wirzenius Sat, 11 Mar 2006 15:04:30 +0200 soundconverter (0.8.0-1) unstable; urgency=low * First release of the Debian package. Took some inspiration and the .desktop file from the packaging for Ubuntu by Daniel Holbach. Closes: #303986. -- Lars Wirzenius Sun, 23 Oct 2005 18:35:39 +0300 debian/compat0000644000000000000000000000000212053277210010363 0ustar 9