[SCM] scenic packaging branch, master, updated. debian/0.5.11-1-15-gd59bd1b

[alexandrequessy-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d59bd1ba7906f77a7dc9206448613d4eb7381691
Author: Alexandre Quessy <Alexandre Quessy alexandre at quessy.net>
Date:   Fri Jun 4 16:48:33 2010 -0400

    Depends on either simplejson or python2.6

diff --git a/debian/control b/debian/control
index ac975e3..5a6db6a 100755
--- a/debian/control
+++ b/debian/control
@@ -80,7 +80,7 @@ Depends:
  python-gst0.10 (>= 0.10.17),
  python-gtk2,
  python-pygame,
- python-simplejson,
+ python-simplejson | python (>= 2.6),
  python-twisted,
  x11-utils,
  yelp

-- 
scenic packaging