From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 29 Jan 2015 21:59:09 +0000 (+0100)
Subject: Merge branch 'release/0.7' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8bda1de9d63bd1f33c813c64425565d9442ec2b6;p=deefuzzer.git

Merge branch 'release/0.7' into dev
---

8bda1de9d63bd1f33c813c64425565d9442ec2b6
diff --cc README.rst
index ffab9e9,249cf3a..3e3dd0a
--- a/README.rst
+++ b/README.rst
@@@ -87,15 -86,11 +87,15 @@@ an install inside Gygwin should work we
  
  To install it, say on Debian, do::
  
-     sudo apt-get install python-pip python-dev libshout3-dev python-liblo python-mutagen \
-                          python-pycurl liblo-dev libshout3-dev librtmp-dev \
-                          python-yaml libcurl4-openssl-dev python-mutagen icecast2
+     sudo apt-get install python-pip python-dev python-liblo \
+                          python-mutagen python-pycurl python-yaml \
+                          libshout3-dev librtmp-dev liblo-dev libcurl4-openssl-dev
  
 -Now, the easiest way to install the DeeFuzzer from a shell::
 +Now update distribute and setuptools::
 +
 +    sudo pip install -U distribute setuptools
 +
 +Then::
  
      sudo pip install deefuzzer
  
@@@ -103,10 -98,12 +103,14 @@@ To upgrade:
  
      sudo pip install -U deefuzzer
  
 +If you have some version problems with the installation, please try in a virtualenv.
 +
  For more informations, please see on `GitHub <https://github.com/yomguy/DeeFuzzer>`_ or tweet to @yomguy
  
+ As a streaming client, the DeeFuzzer needs a local or remote streaming server like Icecast2 to do something::
+ 
+     sudo apt-get install icecast2
+ 
  
  Usage
  =====