]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'crfpa' into tc202
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 19 Jul 2013 13:35:24 +0000 (15:35 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 19 Jul 2013 13:35:24 +0000 (15:35 +0200)
Conflicts:
INSTALL.rst

1  2 
INSTALL.rst
teleforma/views/core.py

diff --cc INSTALL.rst
index 3909e87d8828bfb6e40577273f9e7b950569d422,d7ad0c4858c6151f05b90ee412d009cc39120428..eed767d66b1539cd0e7b0f56999500acd2e5b09c
@@@ -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::
  
Simple merge