From: Simeon Veldstra Date: Mon, 6 Nov 2006 01:15:18 +0000 (-0800) Subject: Merge with bugfix-0.5 X-Git-Tag: v0.5.9 X-Git-Url: http://puddle.ca/cgi-bin/gitweb.cgi?p=mp3togo;a=commitdiff;h=9c9c439d29c945f9fc14b3e2f1f58082eb9b1d03 Merge with bugfix-0.5 --- --- a/LICENSE +++ b/LICENSE @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. --- a/MANIFEST +++ b/MANIFEST @@ -4,7 +4,14 @@ copyright setup.py bin/mp3togo mp3togo/__init__.py -mp3togo/converter.py +mp3togo/cache.py +mp3togo/cluster.py +mp3togo/conf.py +mp3togo/filelist.py +mp3togo/helpers.py mp3togo/main.py mp3togo/options.py -mp3togo/setup.py +mp3togo/pool.py +mp3togo/tags.py +mp3togo/task.py +mp3togo/track.py --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +mp3togo (0.5.8) unstable; urgency=low + + * Fixed failure when converting flac with no GENRE tag + * Bug reported by Norman Baier + * Incorporated new debian directory - no longer native package. + + -- Simeon Veldstra Sun, 5 Nov 2006 16:31:41 -0800 + +mp3togo (0.5.7) unstable; urgency=low + + * New packaging for Debian + + -- Simeon Veldstra Sat, 14 Oct 2006 14:44:47 -0700 + mp3togo (0.5.6) unstable; urgency=low * Fixed divide by zero error and missing symbol error. --- a/debian/control +++ b/debian/control @@ -2,13 +2,17 @@ Source: mp3togo Section: sound Priority: optional Maintainer: Simeon Veldstra -Build-Depends: cdbs, debhelper (>= 4.2.0) -Build-Depends-Indep: python, docbook-to-man +Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python, python-support (>=0.5.2) +#Build-Depends-Indep: python, python-support (>=0.5.3), docbook-to-man +Build-Depends-Indep: docbook-to-man Standards-Version: 3.7.2 Package: mp3togo Architecture: all +#XS-Python-Version: current +#XB-Python-Version: ${python:Versions} Depends: ${python:Depends}, python-pyvorbis, python-eyeD3, mpg321, vorbis-tools +#Provides: ${python:Provides} Recommends: flac, normalize-audio Suggests: lame, python-xmms, faad Description: A tool for loading music on to portable mp3 players --- a/debian/mp3togo.1 +++ b/debian/mp3togo.1 @@ -134,4 +134,4 @@ License can be found in /usr/share/commo .PP mp3togo can be found online at http://puddle.ca/mp3togo -.\" created by instant / docbook-to-man, Tue 04 Jul 2006, 06:03 +.\" created by instant / docbook-to-man, Sun 05 Nov 2006, 16:36 --- /dev/null +++ b/debian/pycompat @@ -0,0 +1 @@ +2 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,42 @@ #!/usr/bin/make -f -# Sample debian/rules that uses cdbs. Originaly written by Robert Millan. +# mp3togo debian/rules +# +# Simeon Veldstra 2006 +# Based on a file originaly written by Robert Millan. # This file is public domain. -DEB_TAR_SRCDIR := mp3togo-0.2.1 -DEB_AUTO_CLEANUP_RCS := yes +#DEB_TAR_SRCDIR := mp3togo-0.2.1 +#DEB_AUTO_CLEANUP_RCS := yes # Add here any variable or target overrides you need - +DEB_PYTHON_SYSTEM=pysupport #include /usr/share/cdbs/1/class/makefile.mk #include /usr/share/cdbs/1/rules/debhelper.mk #include /usr/share/cdbs/1/rules/tarball.mk #include /usr/share/cdbs/1/rules/simple-patchsys.mk +# dh_pysupport include /usr/share/cdbs/1/rules/buildcore.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/python-distutils.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_ISNATIVE="True" +#DEB_ISNATIVE="True" build/mp3togo:: docbook-to-man debian/mp3togo.1.sgml > debian/mp3togo.1 dh_installman debian/mp3togo.1 + # python-support: + #python setup.py build + +# python-support: +#install: +# python setup.py install --root=$(CURDIR)/debian/mp3togo +# +#binary-indep: +# dh_pysupport +# dh_installdeb + + --- a/mp3togo/conf.py +++ b/mp3togo/conf.py @@ -329,7 +329,7 @@ def make_args(helper, input, output, arg if "###input###" in out: out[out.index("###input###")] = input if "###output###" in out: - out[out.index("###output###")] = output + out[out.index("###output###")] = output return out --- a/mp3togo/tags.py +++ b/mp3togo/tags.py @@ -188,7 +188,7 @@ class Tags(UserDict.DictMixin): out.setAlbum(d['ALBUM']) out.setTitle(d['TITLE']) g = eyeD3.Genre() - g.setId(d['GENRE']) + g.setId(d.get('GENRE', 12)) out.setGenre(g) if d.has_key('COMMENT'): out.addComment(d['COMMENT']) --- a/mp3togo/task.py +++ b/mp3togo/task.py @@ -87,6 +87,7 @@ class SimpleTask: self._output = out self._outlock.release() except: + # if verbosity is high enough, print something about the exception self._status = FAILED self._runlock.release() return True @@ -223,7 +224,7 @@ class Task(SimpleTask): while not fp: pass while self._status in (RUNNING, PAUSED): - wpid, status = os.waitpid(pid, os.WNOHANG) + wpid, status = os.waitpid(self._pid, os.WNOHANG) if wpid == pid: # Child exited self._runlock.acquire()