From e0c671bfe44906a67f2689f3f60b44f342732254 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 27 Sep 2011 13:07:54 +0000
Subject: [PATCH] fix install procedure, metadata and dependencies (better now
 for pip or easy_install way)

---
 INSTALL.txt           | 16 +++++++++++++---
 README.txt            | 20 +++++++++++++++++++-
 deefuzzer/__init__.py |  2 +-
 setup.py              |  7 +++----
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/INSTALL.txt b/INSTALL.txt
index a0bd121..f868442 100644
--- 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 584a2a4..0aca39b 100644
--- 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 6f7f4a8..6ad2260 100644
--- 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 1e65918..2f70041 100644
--- 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'], 
-- 
2.39.5