[SCM] live-studio branch, master, updated. 3fdce69a849073859345dd6ed557f13fe2ed3855

[Chris Lamb]

The following commit has been merged in the master branch:
commit c8dc773fce45c874a0647d6c9d6aed2fed9c47a3
Author: Chris Lamb <lamby at debian.org>
Date:   Fri Jul 30 17:11:18 2010 -0400

    Revert "Need this under pysupport for some reason."
    
    This reverts commit 0ba0285babaa74c7b5aa075d0c5a2e56a7a83273.

diff --git a/debian/rules b/debian/rules
index f3fbce9..dad8869 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@
 
 override_dh_auto_install:
 	# Ensure the built packages are in the "live" role.
-	echo 'from live_studio.settings.roles.live import *' \
-		> build/lib/live_studio/settings/role.py
+	echo 'from roles.live import *' > build/lib/live_studio/settings/role.py
 	
 	dh_auto_install
diff --git a/live_studio/settings/role.py b/live_studio/settings/role.py
index d094b8b..d81d63d 100644
--- a/live_studio/settings/role.py
+++ b/live_studio/settings/role.py
@@ -1,4 +1,4 @@
 # This file is overriden by the build system to load the 'live' or 'stage'
 # roles as needed. You should not add any custom configuration here.
 
-from live_studio.settings.roles.local import *
+from roles.local import *

-- 
live-studio