* Fix README

diff --git a/INSTALL b/INSTALL
index 77d13511d9c391d16b08efac8c34610dbb750348..f8050e4e56b0b3a371b28559755bea1e1095e16b 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -8,7 +8,7 @@
 python (>= 2.3.5-7), python-xml, python-central (>= 0.5),
 python-mutagen, python-django (>= 0.96.2), sox, vorbis-tools, flac, normalize-audio,
 python-mysqldb, sqlite3 | mysql-server, octave2.9,
-octave2.9-forge, python-tk, libgd2-xpm, libsndfile1
+octave2.9-forge, python-tk, libgd2-xpm, libsndfile1, python-audiolab
 
 optional:
 lame, ecasound, par2
@@ -18,7 +18,9 @@ lame, ecasound, par2
 
 2.0. Install Telemeta:
 
-* On Debian or Ubuntu just add these lines to your /etc/apt/sources-list:
+* On Debian or Ubuntu :
+
+    Just add these lines to your /etc/apt/sources-list:
 
     deb http://debian.parisson.org/ binary/
     deb-src http://debian.parisson.org/ source/
@@ -29,22 +31,37 @@ lame, ecasound, par2
     $ sudo apt-get update
     $ sudo apt-get install telemeta
 
-* On other linux platforms, install all dependencies listed at 1.
-  and get the lastest tar.gz version of telemeta at http://svn.parisson.org/telemeta/
-  Uncompress the archive, go to the main folder of telemeta and run this command
-  in a shell as root:
+    This method provides the installation of all needed packages
+    thanks to the Debian dependency system.
 
-    $ sudo python setup.py install
+    Go to 2.2.
 
-2.1. Compile wav2png
+* On other linux platforms
 
-    In order to get the wavforms of the audio files, wav2png have to be compiled in telemeta :
-    
-    $ cd $DIR/telemeta/visualization/wav2png/
+    Install all dependencies listed at 1.
+
+    Download the lastest release of telemeta at
+
+    http://svn.parisson.org/telemeta/
+
+    Uncompress the archive like :
+
+    $ tar xzvf telemeta_0.3.2.tar.gz
     
-    where $DIR is the directory where telemeta  installed (e.g. /usr/lib/python2.5/site-packages/)
+    Go to the main folder of telemeta and run this command
+    in a shell as root:
 
-    $ make
+    $ sudo python setup.py install
+
+2.1. Install audiolab
+
+    This is ONLY needed if you did NOT install telemeta with Debian's apt-get.
+
+    In order to get the wavforms of the audio files,
+    python-audiolab have to be installed in telemeta :
+    
+    $ cd telemeta/util/audiolab/
+    $ sudo python setup.py install
     
 2.2. Create a Django project if you haven't already done it:
 

diff --git a/README b/README
index c9b2240a2187f87387fdc0041ada1281f28a75a5..44c719ee588f445c121cc5c1e955471ea6fa1037 100644 (file)
--- a/README
+++ b/README
@@ -39,7 +39,7 @@ soon...) including metadata editing and publishing tools.
 python (>= 2.3.5-7), python-xml, python-central (>= 0.5),
 python-mutagen, python-django, sox, vorbis-tools, flac, normalize-audio,
 ecasound, festival, par2, python-mysqldb, sqlite3 | mysql-server, octave2.9,
-octave2.9-forge, python-tk
+octave2.9-forge, python-tk, python-numpy, python-audiolab, libsndfile1
 
 
 # 3. Installation and usage

diff --git a/debian/control b/debian/control
index f9eca70e393e98863eb0d015ccfaadd7d6d3a873..6fb8f431288ccbd8ccd07aec927b97b3c875216a 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), python-numpy, libsndfile1-dev (>= 1.0.17)
+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)
 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), python-audiolab
+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 (>= 0.7)
 Recommends: lame, vamp-examples
 Suggests: ecasound, festival, par2
 Description: web frontend to backup, transcode and tag any audio content with metadata