* Remove audiolab from install

* Add python-audiolab dependency (see INSTALL)

diff --git a/debian/control b/debian/control
index 7465fe7a62b4407059145776ff13e62b58faa8f6..f9eca70e393e98863eb0d015ccfaadd7d6d3a873 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: sound
 Priority: optional
 Maintainer: Guillaume Pellerin <yomguy@altern.org>
 Uploaders: Paul Brossier <piem@debian.org>
-Build-Depends: debhelper (>= 5.0.0), docbook-to-man, python (>= 2.4), cdbs (>= 0.4.42), python-setuptools (>= 0.6b3), python-support (>= 0.3), python-dev (>= 2.4)
+Build-Depends: debhelper (>= 5.0.0), docbook-to-man, python (>= 2.4), cdbs (>= 0.4.42), python-setuptools (>= 0.6b3), python-support (>= 0.3), python-dev (>= 2.4), python-numpy, libsndfile1-dev (>= 1.0.17)
 Standards-Version: 3.7.3
 
 Package: telemeta
 Architecture: any
-Depends: ${python:Depends}, python-xml, python-mutagen, python-django (>= 0.96.2), python-imaging (>= 1.1.6), sox, vorbis-tools, flac, normalize-audio, python-mysqldb, mysql-server, octave2.9, python-tk, libgd2-xpm, libsndfile1 (>= 1.0.17), python-numpy, python-ctypes (>= 1.0.1)
+Depends: ${python:Depends}, python-xml, python-mutagen, python-django (>= 0.96.2), python-imaging (>= 1.1.6), sox, vorbis-tools, flac, normalize-audio, python-mysqldb, mysql-server, octave2.9, python-tk, libgd2-xpm, libsndfile1 (>= 1.0.17), python-numpy, python-ctypes (>= 1.0.1), python-audiolab
 Recommends: lame, vamp-examples
 Suggests: ecasound, festival, par2
 Description: web frontend to backup, transcode and tag any audio content with metadata

diff --git a/setup.py b/setup.py
index 5a7ab8600ebeaaa0b33804dd4bb646e10932cd49..6038580a10a3f2801724e99fe186506ff25f373c 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -83,6 +83,6 @@ See http://svn.parisson.org/telemeta/ for more informations.
 )
 
 # Install audiolab
-os.chdir('telemeta/util/audiolab/')
-os.system('python setup.py install')
+#os.chdir('telemeta/util/audiolab/')
+#os.system('python setup.py install')
 

diff --git a/telemeta/util/audiolab/scikits.audiolab.egg-info/SOURCES.txt b/telemeta/util/audiolab/scikits.audiolab.egg-info/SOURCES.txt
index c314c46d52aea6795766539c212bc58bf09713fa..7bcea1673ef48ad21821cebb13b9606ccf5bb549 100644 (file)
--- a/telemeta/util/audiolab/scikits.audiolab.egg-info/SOURCES.txt
+++ b/telemeta/util/audiolab/scikits.audiolab.egg-info/SOURCES.txt
@@ -8,16 +8,13 @@ README.txt
 TODO
 generate.sh
 generate_const.py
-generate_const.pyc
 header_parser.py
-header_parser.pyc
 setup.cfg
 setup.py
 site.cfg.win32
 site.cfg_noflac
 tester.py
 scikits/__init__.py
-scikits/__init__.pyc
 scikits.audiolab.egg-info/PKG-INFO
 scikits.audiolab.egg-info/SOURCES.txt
 scikits.audiolab.egg-info/dependency_links.txt
@@ -26,15 +23,11 @@ scikits.audiolab.egg-info/requires.txt
 scikits.audiolab.egg-info/top_level.txt
 scikits.audiolab.egg-info/zip-safe
 scikits/audiolab/__init__.py
-scikits/audiolab/__init__.pyc
 scikits/audiolab/info.py
-scikits/audiolab/info.pyc
 scikits/audiolab/matapi.py
-scikits/audiolab/matapi.pyc
 scikits/audiolab/pyaudioio.py
 scikits/audiolab/pysndfile.py
 scikits/audiolab/pysndfile.py.in
-scikits/audiolab/pysndfile.pyc
 scikits/audiolab/docs/Makefile
 scikits/audiolab/docs/audiolab1.png
 scikits/audiolab/docs/base.tex

diff --git a/telemeta/util/audiolab/scikits/__init__.py b/telemeta/util/audiolab/scikits/__init__.py
index 9b7548367b1f808c0f481a8462c3835045511c81..de40ea7ca058e07a399acf61529d418c07eeee61 100644 (file)
--- a/telemeta/util/audiolab/scikits/__init__.py
+++ b/telemeta/util/audiolab/scikits/__init__.py
@@ -1,2 +1 @@
-#__import__('pkg_resources').declare_namespace(__name__)
-from audiolab import *
+__import__('pkg_resources').declare_namespace(__name__)