[SCM] live-studio branch, master, updated. 72a6b817eb3a9bf32b9ffb966b5dd258b50f5141

[Chris Lamb]

The following commit has been merged in the master branch:
commit 88efbf20e65dbdfe84b089073a3da100bf7dcb9d
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 1 00:25:22 2010 -0400

    Add jquery.js (from libjs-jquery)

diff --git a/debian/control b/debian/control
index d4903a4..3c690c8 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ XS-Python-Version: >= 2.5
 Package: live-studio
 Architecture: all
 Depends:
- ${misc:Depends}, gunicorn, nginx, python-django (>= 1.2),
+ ${misc:Depends}, gunicorn, libjs-jquery, nginx, python-django (>= 1.2),
  python-django-registration, python-psycopg2,
 Description: Debian Live - Web based front-end
  live-studio is a web frontend to the Debian Live tools. It offers users of any
diff --git a/htdocs/media/js/jquery.js b/htdocs/media/js/jquery.js
new file mode 120000
index 0000000..7fff887
--- /dev/null
+++ b/htdocs/media/js/jquery.js
@@ -0,0 +1 @@
+/usr/share/javascript/jquery/jquery.min.js
\ No newline at end of file

-- 
live-studio