# HG changeset patch
# User grandjoncl  <louise.grandjonc@gmail.com>
# Date 1346841981 -7200
# Node ID 25358caa88dc2e1cb78eb0b20188f68e76acc774
# Parent  164a06b496228a65f6936f072a6d981cbec026c9# Parent  08c2f7d08b41d54247b4d8f75c5953033ab0fc21
Merge

diff -r 164a06b49622 -r 25358caa88dc virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Wed Sep 05 12:40:22 2012 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Wed Sep 05 12:46:21 2012 +0200
@@ -52,9 +52,9 @@
         mysqlres = "MySQL-python-1.2.3.win-amd64-py2.7.exe"
     
     URLS.update({
-        'PSYCOPG2': {'setup': 'psycopg2','url': 'psycopg2-2.0.14.win32-py2.6-pg8.4.3-release.zip', 'local':"psycopg2-2.0.14.win32-py2.6-pg8.4.3-release.zip", 'install': {'method': 'install_psycopg2', 'option_str': None, 'dict_extra_env': None}},
-        'PIL': {'setup': 'pil', 'url': 'http://effbot.org/media/downloads/PIL-1.1.7.win32-py2.6.exe', 'local':"PIL-1.1.7.win32-py2.6.exe", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}},
-        'LXML': {'setup': 'lxml', 'url': 'http://pypi.python.org/packages/2.6/l/lxml/lxml-2.2.2-py2.6-win32.egg', 'local':"lxml-2.2.2-py2.6-win32.egg", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}},
+        'PSYCOPG2': {'setup': 'psycopg2','url': 'psycopg2-2.4.5.win32-py2.7-pg9.1.3-release.zip', 'local':"psycopg2-2.4.5.win32-py2.7-pg9.1.3-release.zip", 'install': {'method': 'install_psycopg2', 'option_str': None, 'dict_extra_env': None}},
+        'PIL': {'setup': 'pil', 'url': 'http://effbot.org/media/downloads/PIL-1.1.7.win32-py2.7.exe', 'local':"PIL-1.1.7.win32-py2.7.exe", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}},
+        'LXML': {'setup': 'lxml', 'url': 'http://pypi.python.org/packages/2.7/l/lxml/lxml-2.3-py2.7-win32.egg', 'local':"lxml-2.3-py2.7-win32.egg", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}},
         'MYSQL': { 'setup': 'mysql-python', 'url': mysqlres, 'local': mysqlres, 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}},
     })
 else:
@@ -133,7 +133,7 @@
     
     psycopg2_src_path = os.path.join(psycopg2_base_path, os.listdir(psycopg2_base_path)[0])
     shutil.copytree(os.path.join(psycopg2_src_path, 'psycopg2'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages', 'psycopg2')))
-    shutil.copy(os.path.join(psycopg2_src_path, 'psycopg2-2.0.14-py2.6.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages', 'site-packages')))
+    shutil.copy(os.path.join(psycopg2_src_path, 'psycopg2-2.4.5-py2.7.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages', 'site-packages')))
     
 
 def install_mysql(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop):
diff -r 164a06b49622 -r 25358caa88dc virtualenv/res/src/PIL-1.1.7.win32-py2.6.exe
Binary file virtualenv/res/src/PIL-1.1.7.win32-py2.6.exe has changed
diff -r 164a06b49622 -r 25358caa88dc virtualenv/res/src/PIL-1.1.7.win32-py2.7.exe
Binary file virtualenv/res/src/PIL-1.1.7.win32-py2.7.exe has changed
diff -r 164a06b49622 -r 25358caa88dc virtualenv/res/src/lxml-2.2.2-py2.6-win32.egg
Binary file virtualenv/res/src/lxml-2.2.2-py2.6-win32.egg has changed
diff -r 164a06b49622 -r 25358caa88dc virtualenv/res/src/lxml-2.3-py2.7-win32.egg
Binary file virtualenv/res/src/lxml-2.3-py2.7-win32.egg has changed
diff -r 164a06b49622 -r 25358caa88dc virtualenv/res/src/psycopg2-2.0.14.win32-py2.6-pg8.4.3-release.zip
Binary file virtualenv/res/src/psycopg2-2.0.14.win32-py2.6-pg8.4.3-release.zip has changed
diff -r 164a06b49622 -r 25358caa88dc virtualenv/res/src/psycopg2-2.4.5.win32-py2.7-pg9.1.3-release.zip
Binary file virtualenv/res/src/psycopg2-2.4.5.win32-py2.7-pg9.1.3-release.zip has changed