# HG changeset patch
# User Drew Perttula <drewp@bigasterisk.com>
# Date 2012-06-05 20:40:35
# Node ID a301a0039c66cc93f41a1cff2300988c3c67832f
# Parent  d9e61d97c5787eb6a15728c748656bc429519180

buildout and rdflib updates
Ignore-this: 912b5b138f73771434f6cc1b077841c0

diff --git a/bin/ascoltami b/bin/ascoltami
--- a/bin/ascoltami
+++ b/bin/ascoltami
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!bin/python
 
 # this is a fork from semprini/ascotalmi to use mpd
 
diff --git a/bin/ascoltami2 b/bin/ascoltami2
--- a/bin/ascoltami2
+++ b/bin/ascoltami2
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!bin/python
 import web, thread, gobject, sys, optparse, logging
 from rdflib import URIRef
 sys.path.append(".")
diff --git a/bin/curvecalc b/bin/curvecalc
--- a/bin/curvecalc
+++ b/bin/curvecalc
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!bin/python
 
 """
 now launches like this:
@@ -26,7 +26,7 @@ from zope.interface import implements
 from twisted.internet.defer import succeed
 from twisted.web.iweb import IBodyProducer
 from rdflib import Literal, URIRef, RDF, RDFS
-from rdflib.Graph import Graph
+from rdflib import Graph
 import rdflib
 import logging
 log = logging.getLogger()
@@ -500,7 +500,7 @@ def createHelpLines(root):
 
 def currentlyPlayingSong():
     """ask the music player what song it's on"""
-    t = jsonlib.read(restkit.Resource(networking.musicUrl()).get("time").body)
+    t = jsonlib.read(restkit.Resource(networking.musicPlayer.url).get("time").body)
     if t['song'] is None:
         raise ValueError("music player is not playing any song")
     return URIRef(t['song'])
diff --git a/bin/dmxserver b/bin/dmxserver
--- a/bin/dmxserver
+++ b/bin/dmxserver
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!bin/python
 """
 
 this is the only process to talk to the dmx hardware. other clients
diff --git a/buildout.cfg b/buildout.cfg
new file mode 100644
--- /dev/null
+++ b/buildout.cfg
@@ -0,0 +1,21 @@
+[buildout]
+parts = external_libs 
+bin-directory = bin
+download-cache = /tmp/
+
+
+
+[external_libs]
+recipe = zc.recipe.egg
+eggs = web.py==0.36
+       cyclone==1.0-rc4
+       rdflib==3.2.1
+       restkit==4.1.2
+
+python = python
+interpreter = python
+extra-paths = 
+
+[python]
+executable = /usr/bin/python2.7
+
diff --git a/light9/Submaster.py b/light9/Submaster.py
--- a/light9/Submaster.py
+++ b/light9/Submaster.py
@@ -1,6 +1,6 @@
 from __future__ import division
 import os, logging
-from rdflib.Graph import Graph
+from rdflib import Graph
 from rdflib import RDFS, Literal, BNode
 from light9.namespaces import L9, XSD
 from light9.TLUtility import dict_scale, dict_max
diff --git a/light9/showconfig.py b/light9/showconfig.py
--- a/light9/showconfig.py
+++ b/light9/showconfig.py
@@ -1,6 +1,6 @@
 import time, logging
 from os import path, getenv
-from rdflib.Graph import Graph
+from rdflib import Graph
 from rdflib import URIRef
 from namespaces import MUS, L9
 log = logging.getLogger('showconfig')
diff --git a/show/dance2011/config.n3 b/show/dance2011/config.n3
--- a/show/dance2011/config.n3
+++ b/show/dance2011/config.n3
@@ -19,8 +19,8 @@ show:dance2011 :playList (
 
 show:dance2011 :networking sh:netHome .
 sh:netHome  
-  :musicPlayer <http://plus:8040/>;
-  :dmxServer <http://plus:8030/>;
+  :musicPlayer <http://dash:8040/>;
+  :dmxServer <http://dash:8030/>;
   :keyboardComposer <http://dash:8050/> .
 
 :Song is rdf:type of sh:song1, sh:song2, sh:song3, sh:song4,