Automated merge with ssh://hg@bitbucket.org/ianb/virtualenv1.4.1

7 files changed, 7 insertions, 6 deletions

diff --git a/bin/refresh-support-files.py b/bin/refresh-support-files.py
index 41410be..4aed98e 100755
--- a/bin/refresh-support-files.py
+++ b/bin/refresh-support-files.py
@@ -17,7 +17,7 @@ files = [
     ('http://pypi.python.org/packages/2.4/s/setuptools/setuptools-0.6c11-py2.4.egg', 'setuptools-0.6c11-py2.4.egg'),
     ('http://python-distribute.org/distribute_setup.py', 'distribute_setup.py'),
     ('http://pypi.python.org/packages/source/d/distribute/distribute-0.6.8.tar.gz', 'distribute-0.6.8.tar.gz'),
-    ('http://pypi.python.org/packages/source/p/pip/pip-0.5.1.tar.gz', 'pip-0.5.1.tar.gz'),
+    ('http://pypi.python.org/packages/source/p/pip/pip-0.6.tar.gz', 'pip-0.6.tar.gz'),
     ]
 
 def main():
diff --git a/docs/conf.py b/docs/conf.py
index 2e9f887..21a2366 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -42,7 +42,7 @@ copyright = '2009, Ian Bicking, The Open Planning Project'
 # The short X.Y version.
 version = '1.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.4.post1'
+release = '1.4.1'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
diff --git a/docs/index.txt b/docs/index.txt
index 2b3f3ff..c8fef4e 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -317,8 +317,9 @@ Other Documentation and Links
 Changes & News
 --------------
 
-hg tip
-~~~~~~
+1.4.1
+~~~~~
+* Include pip 0.6
 
 1.4
 ~~~
diff --git a/setup.py b/setup.py
index bd974d0..4f15976 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     print 'Note: without Setuptools installed you will have to use "python -m virtualenv ENV"'
 import sys, os
 
-version = '1.4.post1'
+version = '1.4.1'
 
 f = open(os.path.join(os.path.dirname(__file__), 'docs', 'index.txt'))
 long_description = f.read().strip()
diff --git a/virtualenv.py b/virtualenv.py
index 0c6135a..2ca80d4 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -407,7 +407,7 @@ def filter_ez_setup(line, project_name='setuptools'):
 
 def main():
     parser = optparse.OptionParser(
-        version="1.4.post1",
+        version="1.4.1",
         usage="%prog [OPTIONS] DEST_DIR")
 
     parser.add_option(
diff --git a/virtualenv_support/pip-0.5.1.tar.gz b/virtualenv_support/pip-0.5.1.tar.gz
deleted file mode 100644
index 77ee2aa..0000000
--- a/virtualenv_support/pip-0.5.1.tar.gz
+++ /dev/null
diff --git a/virtualenv_support/pip-0.6.tar.gz b/virtualenv_support/pip-0.6.tar.gz
new file mode 100644
index 0000000..c9fd867
--- /dev/null
+++ b/virtualenv_support/pip-0.6.tar.gz