# HG changeset patch
# User cavaliet
# Date 1336041547 -7200
# Node ID 9420412046a3c59426256776b1ab7f7098fe72a0
# Parent  d80485e7693e0d7e2ba34e00fa4a57dc46ab7996# Parent  be146024440c6d1bd382a4f63020e0d0165b9fca
Merge with be146024440c6d1bd382a4f63020e0d0165b9fca

diff -r d80485e7693e -r 9420412046a3 .hgtags
--- a/.hgtags	Thu May 03 12:37:16 2012 +0200
+++ b/.hgtags	Thu May 03 12:39:07 2012 +0200
@@ -49,3 +49,6 @@
 bc018d2744f21f8fb384ebe2e0400d6b44edcb91 V01.05
 d7c1c1f04694d5eddc691d0d08d6c73cf4c08567 V01.05
 37c81c68ccf6fac4af00b2a18e4f89b205c521bd V01.06
+006f1e3e5398ca2fb0d6c7944f37421ce3138717 V01.07
+006f1e3e5398ca2fb0d6c7944f37421ce3138717 V01.07
+81cbac0d6d8c9309cee2663dc2b6dc1d85097cf1 V01.07
diff -r d80485e7693e -r 9420412046a3 src/ldt/README
--- a/src/ldt/README	Thu May 03 12:37:16 2012 +0200
+++ b/src/ldt/README	Thu May 03 12:39:07 2012 +0200
@@ -10,3 +10,55 @@
 compile messages for js
 python ../../../web/ldtplatform/manage.py makemessages -a -d djangojs
 python ../../../web/ldtplatform/manage.py compilemessages
+
+
+============
+Dependencies
+============
+Python : Python Software Foundation License
+Django==1.3.1 : BSD
+JCC==2.8 : Apache Public licence 2.0
+PIL==1.1.7 : Python (MIT style) : http://www.pythonware.com/products/pil/license.htm
+South==0.7.3 : Apache Public licence 2.0
+distribute==0.6.14 : Python Software Foundation License or Zope Public License
+django-guardian==1.0.3 : BSD http://packages.python.org/django-guardian/license.html
+django-oauth==1.1 : BSD http://code.larlet.fr/django-oauth/raw/549a34c81394/LICENSE
+django-openid-consumer==0.1.1 BSD http://django-openid-consumer.googlecode.com/svn/trunk/LICENSE
+django-piston==0.2.2 BSD 
+django-registration==0.8-alpha-1 BSD https://bitbucket.org/ubernostrum/django-registration/raw/27bccd108cde/LICENSE
+django-social-auth==0.3.10 BSD Like https://raw.github.com/uswaretech/Django-Socialauth/master/docs/LICENSE
+django-tagging==0.3.1 BSD http://django-tagging.googlecode.com/svn/trunk/LICENSE.txt
+httplib2==0.6.0 MIT http://httplib2.googlecode.com/hg/README
+lucene==3.1.0 Apache 2.0 http://www.apache.org/licenses/LICENSE-2.0
+lxml==2.3.1 BSD https://raw.github.com/lxml/lxml/master/doc/licenses/BSD.txt
+libxml2, libxslt2 : MIT http://www.opensource.org/licenses/mit-license.html
+oauth2==1.5.167 : MIT https://raw.github.com/simplegeo/python-oauth2/master/LICENSE.txt
+python-openid==2.2.5 : Apache Software License https://raw.github.com/openid/python-openid/master/LICENSE
+sorl-thumbnail==11.12 : BSD https://raw.github.com/sorl/sorl-thumbnail/master/LICENSE
+
+deployment:
+psycopg2==2.4 : LGPL or ZPL https://dndg.it/cgi-bin/gitweb.cgi?p=public/psycopg2.git;a=blob_plain;f=LICENSE;h=dd7c124d8c666722ef3e0e5637412f5c7dbdf1f2;hb=HEAD
+wsgiref==0.1.2 : PSF or ZPL 
+uWSGI : deployment GPL V2.0
+pylibmc==1.2.2 : 3-clause BSD http://www.opensource.org/licenses/bsd-license.php
+python-memcached==1.48 : Python Software Foundation License 
+
+
+============
+javascript
+============
+jquery http://craigsworks.com/projects/qtip2/
+jquery nyroModal 
+jquery qtip MIT or GPLv2 licenses
+jquery sparkline New BSD License http://omnipotent.net/jquery.sparkline/
+jquery textchange 
+jquery tools
+jquery login
+jquery validate
+jquery ui
+jwplayer
+popcorn.js
+raphael.js
+swfobject.js
+ZeroClipboard
+tiny_mce
diff -r d80485e7693e -r 9420412046a3 src/ldt/ldt/__init__.py
--- a/src/ldt/ldt/__init__.py	Thu May 03 12:37:16 2012 +0200
+++ b/src/ldt/ldt/__init__.py	Thu May 03 12:39:07 2012 +0200
@@ -1,4 +1,4 @@
-VERSION = (1, 6, 0, "final", 0)
+VERSION = (1, 7, 0, "final", 0)
 
 
 def get_version():
diff -r d80485e7693e -r 9420412046a3 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Thu May 03 12:37:16 2012 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Thu May 03 12:39:07 2012 +0200
@@ -24,8 +24,6 @@
     'HTTPLIB2': { 'setup': 'python-httplib2', 'url':'http://httplib2.googlecode.com/files/httplib2-0.6.0.tar.gz', 'local':"httplib2-0.6.0.tar.gz"},
     'DJANGO-OAUTH-PLUS': { 'setup': 'django-oauth-plus', 'url':'http://bitbucket.org/david/django-oauth-plus/get/f314f018e473.gz', 'local':"django-oauth-plus.tar.gz"},
     'MYSQL': { 'setup': 'mysql-python', 'url': 'http://sourceforge.net/projects/mysql-python/files/mysql-python/1.2.3/MySQL-python-1.2.3.tar.gz/download', 'local':"MySQL-python-1.2.3.tar.gz"},
-    'SETUPTOOLS-HG': { 'setup':'mercurial_hg', 'url':'http://pypi.python.org/packages/source/s/setuptools_hg/setuptools_hg-0.2.tar.gz', 'local':"setuptools_hg-0.2.tar.gz"},
-    'MERCURIAL': {'setup':'mercurial', 'url':'http://pypi.python.org/packages/source/d/mercurial/mercurial-1.7.5.tar.gz', 'local':"mercurial-1.7.5.tar.gz"},
     'OPENID': {'setup':'openid', 'url':'http://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.tar.gz', 'local':"python-openid-2.2.5.tar.gz"},
     'DJANGO_OPENID_CONSUMER': {'setup':'django_openid_consumer', 'url':'http://pypi.python.org/packages/source/d/django-openid-consumer/django-openid-consumer-0.1.1.tar.gz', 'local':"django-openid-consumer-0.1.1.tar.gz"},
     'SOCIAL_AUTH': {'setup':'social_auth', 'url':'https://github.com/omab/django-social-auth/tarball/v0.3.10', 'local':"omab-django-social-auth-v0.3.10-modified.tar.gz"},
diff -r d80485e7693e -r 9420412046a3 virtualenv/res/src/MySQL-python-1.2.3.tar.gz
Binary file virtualenv/res/src/MySQL-python-1.2.3.tar.gz has changed
diff -r d80485e7693e -r 9420412046a3 virtualenv/res/src/mercurial-1.7.5.tar.gz
Binary file virtualenv/res/src/mercurial-1.7.5.tar.gz has changed
diff -r d80485e7693e -r 9420412046a3 virtualenv/res/src/setuptools_hg-0.2.tar.gz
Binary file virtualenv/res/src/setuptools_hg-0.2.tar.gz has changed
diff -r d80485e7693e -r 9420412046a3 virtualenv/setup/res/res_create_env.py
--- a/virtualenv/setup/res/res_create_env.py	Thu May 03 12:37:16 2012 +0200
+++ b/virtualenv/setup/res/res_create_env.py	Thu May 03 12:39:07 2012 +0200
@@ -7,8 +7,6 @@
 
 INSTALLS = [#(key,method, option_str, dict_extra_env)
     ('DISTRIBUTE', 'pip', None, None),
-    ('MERCURIAL', 'pip', None, None),
-    ('SETUPTOOLS-HG', 'pip', None, None), 
 ]
 
 def generate_install_methods(path_locations, src_base, Logger, call_subprocess):    
diff -r d80485e7693e -r 9420412046a3 virtualenv/web/res/res_create_env.py
--- a/virtualenv/web/res/res_create_env.py	Thu May 03 12:37:16 2012 +0200
+++ b/virtualenv/web/res/res_create_env.py	Thu May 03 12:39:07 2012 +0200
@@ -23,8 +23,6 @@
 
 INSTALLS.extend([ #(key,method, option_str, dict_extra_env)
     ('SOUTH', 'pip', None, None),
-    ('SETUPTOOLS-HG', 'pip', None, None), 
-    ('MYSQL', 'pip', None, None),
     ('PIL', 'easy_install', None, None), 
     ('DJANGO','pip', None, None),
     ('DJANGO-EXTENSIONS', 'pip', None, None),