fix install procedure, metadata and dependencies (better now for pip or easy_install...

diff --git a/INSTALL.txt b/INSTALL.txt
index a0bd121f13db281306cac2db207f9ae5a01fc5eb..f8684429ab61644c04c71f008b153b37c1a29be2 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -26,13 +26,23 @@ recommends: icecast2, python-setuptools
 Install
 =========
 
-To install the DeeFuzzer, go to the main deefuzzer app directory, for example::
+Please first install libshout3 and liblo from source OR libshout3-dev and liblo-dev from your own distribution package manager.
+
+Now, the easiest way to install the DeeFuzzer from a shell::
+
+       sudo pip install deefuzzer
+
+or::
+
+       sudo easy_install install deefuzzer
+
+To install the DeeFuzzer from sources, go to the main deefuzzer app directory, for example::
     
     cd deefuzzer-0.5.0
     
-and run the python installer::
+and run::
     
-    sudo python install.py
+    sudo python setup.py install
 
 For more informations, see http://svn.parisson.org/deefuzzer/
 

diff --git a/README.txt b/README.txt
index 584a2a4837a362b21e5557e3cca58d3b6294b6f2..0aca39b75f4976145421edbdc851e36da5254243 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -26,7 +26,25 @@ Please see example/myfuzz.xml for an example.
 Installation
 ============
 
-see INSTALL
+Please first install libshout3 and liblo from source OR libshout3-dev and liblo-dev from your own distribution package manager.
+
+Now, the easiest way to install the DeeFuzzer from a shell::
+
+       sudo pip install deefuzzer
+
+or::
+
+       sudo easy_install deefuzzer
+
+To install the DeeFuzzer from sources, go to the main deefuzzer app directory, for example::
+
+    cd deefuzzer-0.5.0
+
+and run::
+
+    sudo python setup.py install
+
+For more informations, see http://svn.parisson.org/deefuzzer/
 
 
 License

diff --git a/deefuzzer/__init__.py b/deefuzzer/__init__.py
index 6f7f4a8eb0af40a756e1459f92aa65cd6036f601..6ad22601756424a7fe3a4fa470ebd13a62e38484 100644 (file)
--- a/deefuzzer/__init__.py
+++ b/deefuzzer/__init__.py
@@ -1,4 +1,4 @@
 from core import *
 from tools import *
 
-__version__ = '0.5.8'
+__version__ = '0.6'

diff --git a/setup.py b/setup.py
index 1e65918f4784c57f53e914f01a0b18ab948aa998..2f700412ed68b97ade806eb06ef7c1e2b55be70c 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -4,9 +4,8 @@
 '''The setup and build script for the python-twitter library.'''
 
 import os
-from distutils.core import setup
-from deefuzzer import __version__
 
+__version__ = '0.6'
 __author__ = 'yomguy@parisson.com'
     
 # The base package metadata to be used by both distutils and setuptools
@@ -17,10 +16,10 @@ METADATA = dict(
   description='an easy and instant media streaming tool',
   author='Guillaume Pellerin', 
   author_email='yomguy@parisson.com',
-  license='License.txt',
+  license='CeCILL',
   url='http://svn.parisson.org/deefuzzer',
   keywords='audio video streaming broadcast shout',
-  install_requires = ['setuptools', 'tinyurl', 'python-shout', 'python-twitter'],
+  install_requires = ['setuptools', 'tinyurl', 'python-shout', 'python-twitter', 'mutagen', 'pyliblo'],
   packages=['deefuzzer', 'deefuzzer.tools'], 
   include_package_data = True,
   scripts=['scripts/deefuzzer'],