From dde8ba5348491a01d21a430f17fd7511f133d6db Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Mon, 11 Jun 2012 12:25:10 +0200
Subject: [PATCH] remove oxtimeline cruft from readme/vm

---
 README      | 9 +++++----
 vm/build.sh | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README b/README
index fc8f2986..814ff8bc 100644
--- a/README
+++ b/README
@@ -2,8 +2,7 @@ pan.do/ra - open media archive
 
 == SETUP ==
 pan.do/ra is known to work with Ubuntu 12.04, older versions of
-Ubuntu or other distributions should work
-if the dependencies are up to date.
+Ubuntu or other distributions should also work.
 
 To setup pan.do/ra, you need python, bazaar, pip and virtualenv
 and several other python modules:
@@ -20,9 +19,10 @@ and several other python modules:
             python-setuptools python-pip python-virtualenv ipython \
             python-dev python-imaging python-numpy python-psycopg2 \
             python-geoip python-html5lib python-lxml \
+            python-gst0.10 gstreamer0.10-plugins-good gstreamer0.10-plugins-bad \ 
             postgresql postgresql-contrib rabbitmq-server \
             ffmpeg2theora ffmpeg \
-            python-ox oxframe oxtimeline
+            python-ox oxframe
 
 * Pan.do/ra
 Get code from bazzar
@@ -45,6 +45,7 @@ after that
 
 create / update static files
     
+    ./manage.py collectstatic -l --noinput
     ./manage.py update_static 
     ./manage.py compile_pyc
 
@@ -140,5 +141,5 @@ to apply them.
     ./manage.py runserver
 
   and background task in another:
-    ./manage.py celeryd -B -Q default,encoding
+    ./manage.py celeryd -B -Q celery,default,encoding
 
diff --git a/vm/build.sh b/vm/build.sh
index 69a66318..585e5bbc 100755
--- a/vm/build.sh
+++ b/vm/build.sh
@@ -35,7 +35,10 @@ sudo  vmbuilder vbox ubuntu --suite=precise \
     --addpkg python-simplejson \
     --addpkg python-lxml \
     --addpkg python-html5lib \
-    --addpkg oxtimeline \
+    --addpkg python-ox \
+    --addpkg python-gst0.10 \
+    --addpkg gstreamer0.10-plugins-good \
+    --addpkg gstreamer0.10-plugins-bad \
     --addpkg oxframe \
     --addpkg ffmpeg \
     --addpkg ffmpeg2theora \