[SCM] live-studio branch, master, updated. a50c5b65aa3ae7caaea04d88a96b677e541c7eff

Chris Lamb lamby at debian.org
Fri Jul 30 21:10:08 UTC 2010


The following commit has been merged in the master branch:
commit 0ba0285babaa74c7b5aa075d0c5a2e56a7a83273
Author: Chris Lamb <lamby at debian.org>
Date:   Fri Jul 30 16:06:04 2010 -0400

    Need this under pysupport for some reason.

diff --git a/debian/rules b/debian/rules
index dad8869..f3fbce9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@
 
 override_dh_auto_install:
 	# Ensure the built packages are in the "live" role.
-	echo 'from roles.live import *' > build/lib/live_studio/settings/role.py
+	echo 'from live_studio.settings.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 d81d63d..d094b8b 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 roles.local import *
+from live_studio.settings.roles.local import *

-- 
live-studio



More information about the debian-live-changes mailing list