From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 19 Jul 2013 13:35:24 +0000 (+0200)
Subject: Merge branch 'crfpa' into tc202
X-Git-Tag: 1.3-TC~29^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=343f60e0131be523e0051b34bf8fad43bd6a2988;p=teleforma.git

Merge branch 'crfpa' into tc202

Conflicts:
	INSTALL.rst
---

343f60e0131be523e0051b34bf8fad43bd6a2988
diff --cc INSTALL.rst
index 3909e87d,d7ad0c48..eed767d6
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@@ -31,9 -31,13 +31,13 @@@ Install the system dependencie
  
          sudo aptitude install python python-dev python-pip python-xml python-mysqldb mysql-server \
              python-ctypes python-setuptools python-support python-docutils \
 -            python-libxml2 python-lxml python-numpy \
 +            python-libxml2 python-lxml python-numpy python-yaml \
              python-scipy python-imaging python-mutagen python-gobject python-gst0.10 \
-             gstreamer0.10-plugins-base gobject-introspection python-psutil nginx apache2 libapache2-mod-wsgi
 -            gobject-introspection python-psutil nginx \
++            gobject-introspection python-psutil nginx apache2 libapache2-mod-wsgi \
+             gstreamer0.10-plugins-base gstreamer0.10-plugins-good \
+             gstreamer0.10-plugins-bad gstreamer0.10-plugins-ugly
+ 
+         sudo apt-get remove --purge pulseaudio
  
      To get MP3 reading and writing::