--- a/patches/sugar-01-python.diff Tue Mar 09 11:19:44 2010 +0000
+++ b/patches/sugar-01-python.diff Wed Mar 10 19:32:51 2010 +0000
@@ -46,20 +46,19 @@
import sys
from sugar.bundle.activitybundle import ActivityBundle
---- sugar-0.87.3/bin/sugar.in-orig 2010-02-02 13:02:09.543970535 -0600
-+++ sugar-0.87.3/bin/sugar.in 2010-02-02 13:02:51.316313786 -0600
+--- sugar-0.87.8/data/em.py-orig 2010-03-10 12:41:12.197483500 -0600
++++ sugar-0.87.8/data/em.py 2010-03-10 12:41:17.631671204 -0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+ #
+ # $Id: //projects/empy/em.py#146 $ $Date: 2003/10/27 $
+
+--- sugar-0.87.8/bin/sugar.in-orig 2010-03-10 12:40:57.072700009 -0600
++++ sugar-0.87.8/bin/sugar.in 2010-03-10 12:41:04.691467318 -0600
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
- usage() {
- cat <<EOF
-@@ -53,7 +53,7 @@ if [ -f ~/.sugar/debug ]; then
- . ~/.sugar/debug
- fi
-
--echo Xcursor.theme: sugar | xrdb -merge
-+echo Xcursor.theme: sugar | /usr/X11/bin/xrdb -merge
- metacity --no-force-fullscreen -d $DISPLAY &
-
- exec sugar-session
+ if [ "$(id -u)" -eq 0 -o "$(id -ru)" -eq 0 ] ; then
+ echo Refusing to run as root.