[Python-modules-commits] r16408 - in packages/python-virtualenv/trunk/debian (6 files)
chaica-guest at users.alioth.debian.org
chaica-guest at users.alioth.debian.org
Wed Apr 6 22:04:37 UTC 2011
Date: Wednesday, April 6, 2011 @ 22:04:30
Author: chaica-guest
Revision: 16408
* New upstream version. Closes: #617941
* debian/control
- Removed python-support from Build-Depends-Indep
- Bump python version to 2.6.6-3
- Removed XB-Python-Version
- Bump to 3.9.1.0 (No changes needed)
* debian/python-virtualenv.lintian-overrides
- Added overrides for the 2.7 egg
* debian/rules
- Added --with python2 to dh $@
* debian/virtualenv.1
- Added the prompt option description
* debian/patches/add_distribute.patch
- Updated for the new upstream file virtualenv.py
Modified:
packages/python-virtualenv/trunk/debian/changelog
packages/python-virtualenv/trunk/debian/control
packages/python-virtualenv/trunk/debian/patches/add_distribute.patch
packages/python-virtualenv/trunk/debian/python-virtualenv.lintian-overrides
packages/python-virtualenv/trunk/debian/rules
packages/python-virtualenv/trunk/debian/virtualenv.1
Modified: packages/python-virtualenv/trunk/debian/changelog
===================================================================
--- packages/python-virtualenv/trunk/debian/changelog 2011-04-06 19:52:34 UTC (rev 16407)
+++ packages/python-virtualenv/trunk/debian/changelog 2011-04-06 22:04:30 UTC (rev 16408)
@@ -1,3 +1,22 @@
+python-virtualenv (1.6-1) unstable; urgency=low
+
+ * New upstream version. Closes: #617941
+ * debian/control
+ - Removed python-support from Build-Depends-Indep
+ - Bump python version to 2.6.6-3
+ - Removed XB-Python-Version
+ - Bump to 3.9.1.0 (No changes needed)
+ * debian/python-virtualenv.lintian-overrides
+ - Added overrides for the 2.7 egg
+ * debian/rules
+ - Added --with python2 to dh $@
+ * debian/virtualenv.1
+ - Added the prompt option description
+ * debian/patches/add_distribute.patch
+ - Updated for the new upstream file virtualenv.py
+
+ -- Carl Chenet <chaica at ohmytux.com> Thu, 07 Apr 2011 01:45:11 +0200
+
python-virtualenv (1.4.9-3) unstable; urgency=low
* Team upload.
@@ -3,5 +22,5 @@
* Update look_for_external_files.patch to use /usr/share/python-virtualenv
- -- Piotr Ożarowski <piotr at debian.org> Sun, 22 Aug 2010 15:55:07 +0200
+ -- Carl Chenet <chaica at ohmytux.com> Wed, 06 Apr 2011 22:35:06 +0200
python-virtualenv (1.4.9-2) unstable; urgency=low
Modified: packages/python-virtualenv/trunk/debian/control
===================================================================
--- packages/python-virtualenv/trunk/debian/control 2011-04-06 19:52:34 UTC (rev 16407)
+++ packages/python-virtualenv/trunk/debian/control 2011-04-06 22:04:30 UTC (rev 16408)
@@ -1,21 +1,20 @@
Source: python-virtualenv
Section: python
Priority: optional
+X-Python-Version: >= 2.5
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Carl Chenet <chaica at ohmytux.com>, Jeff Licquia <licquia at debian.org>
Homepage: http://pypi.python.org/pypi/virtualenv
Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/python-virtualenv/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-virtualenv/trunk/
-Build-Depends: debhelper (>= 7.0.50~), python
-Build-Depends-Indep: python-support, python-setuptools
-Standards-Version: 3.9.1
-XS-Python-Version: all
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3)
+Build-Depends-Indep: python-setuptools
+Standards-Version: 3.9.1.0
Package: python-virtualenv
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources, python-setuptools
Recommends: python-pip (>= 0.7.2)
-XB-Python-Version: ${python:Versions}
Description: Python virtual environment creator
The virtualenv utility creates virtual Python instances, each invokable
with its own Python executable. Each instance can have different sets
Modified: packages/python-virtualenv/trunk/debian/patches/add_distribute.patch
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/add_distribute.patch 2011-04-06 19:52:34 UTC (rev 16407)
+++ packages/python-virtualenv/trunk/debian/patches/add_distribute.patch 2011-04-06 22:04:30 UTC (rev 16408)
@@ -1,20 +1,20 @@
Description: Add --distribute as an option in virtualenv.py
- Enable --distribute by default in virtualenv.py but add --setuptools
+ Enable --distribute by default in virtualenv.py but add --setuptools
and $VIRTUALENV_USE_SETUPTOOLS to fallback to the default upstream
behavior.
Origin: vendor, http://patches.ubuntu.com/p/python-virtualenv/python-virtualenv_1.4.5-1ubuntu1.patch
-Author: Piotr Ożarowski <piotr at debian.org>
+Author: Piotr Ożarowski <piotr at debian.org>, Carl Chenet <chaica at ohmytux.com>
-Index: python-virtualenv-1.4.9/virtualenv.py
+Index: virtualenv-1.6/virtualenv.py
===================================================================
---- python-virtualenv-1.4.9.orig/virtualenv.py
-+++ python-virtualenv-1.4.9/virtualenv.py
-@@ -467,9 +467,16 @@ def main():
+--- virtualenv-1.6.orig/virtualenv.py 2011-04-07 00:01:39.000000000 +0200
++++ virtualenv-1.6/virtualenv.py 2011-04-07 00:08:07.000000000 +0200
+@@ -678,9 +678,16 @@
parser.add_option(
'--distribute',
dest='use_distribute',
- action='store_true',
-- help='Use Distribute instead of Setuptools. Set environ variable'
+- help='Use Distribute instead of Setuptools. Set environ variable '
- 'VIRTUALENV_USE_DISTRIBUTE to make it the default ')
+ action='store_true', default=True,
+ help='Ignored. Distribute is used by default. See --setuptools '
@@ -27,21 +27,21 @@
+ help='Use Setuptools instead of Distribute. Set environ variable '
+ 'VIRTUALENV_USE_SETUPTOOLS to make it the default.')
- if 'extend_parser' in globals():
- extend_parser(parser)
-@@ -593,7 +600,7 @@ def call_subprocess(cmd, show_stdout=Tru
+ parser.add_option(
+ '--prompt=',
+@@ -818,7 +825,7 @@
def create_environment(home_dir, site_packages=True, clear=False,
-- unzip_setuptools=False, use_distribute=False):
-+ unzip_setuptools=False, use_distribute=True):
+- unzip_setuptools=False, use_distribute=False,
++ unzip_setuptools=False, use_distribute=True,
+ prompt=None):
"""
Creates a new environment in ``home_dir``.
+@@ -837,10 +844,10 @@
-@@ -611,10 +618,10 @@ def create_environment(home_dir, site_pa
+ install_distutils(home_dir)
- install_distutils(lib_dir, home_dir)
-
- if use_distribute or os.environ.get('VIRTUALENV_USE_DISTRIBUTE'):
- install_distribute(py_executable, unzip=unzip_setuptools)
- else:
Modified: packages/python-virtualenv/trunk/debian/python-virtualenv.lintian-overrides
===================================================================
--- packages/python-virtualenv/trunk/debian/python-virtualenv.lintian-overrides 2011-04-06 19:52:34 UTC (rev 16407)
+++ packages/python-virtualenv/trunk/debian/python-virtualenv.lintian-overrides 2011-04-06 22:04:30 UTC (rev 16408)
@@ -6,3 +6,4 @@
python-virtualenv binary: script-not-executable ./usr/share/python-virtualenv/setuptools-0.6c11-py2.4.egg
python-virtualenv binary: script-not-executable ./usr/share/python-virtualenv/setuptools-0.6c11-py2.5.egg
python-virtualenv binary: script-not-executable ./usr/share/python-virtualenv/setuptools-0.6c11-py2.6.egg
+python-virtualenv binary: script-not-executable ./usr/share/python-virtualenv/setuptools-0.6c11-py2.7.egg
Modified: packages/python-virtualenv/trunk/debian/rules
===================================================================
--- packages/python-virtualenv/trunk/debian/rules 2011-04-06 19:52:34 UTC (rev 16407)
+++ packages/python-virtualenv/trunk/debian/rules 2011-04-06 22:04:30 UTC (rev 16408)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --with python2
override_dh_installchangelogs:
dh_installchangelogs docs/news.txt
Modified: packages/python-virtualenv/trunk/debian/virtualenv.1
===================================================================
--- packages/python-virtualenv/trunk/debian/virtualenv.1 2011-04-06 19:52:34 UTC (rev 16407)
+++ packages/python-virtualenv/trunk/debian/virtualenv.1 2011-04-06 22:04:30 UTC (rev 16408)
@@ -81,14 +81,17 @@
.PP
\fB\-\-distribute\fR
.RS 4
-Ignored. Distribute is used by default. See
-\fB\-\-setuptools\fR to use Setuptools instead of Distribute.
+Ignored. Distribute is used by default. See \fB\-\-setuptools\fR to use Setuptools instead of Distribute\&.
.RE
.PP
\fB\-\-setuptools\fR
-Use Setuptools instead of Distribute. Set environ
-variable VIRTUALENV_USE_SETUPTOOLS to make it the
-default.
+.RS 4
+Use Setuptools instead of Distribute. Set environ variable VIRTUALENV_USE_SETUPTOOLS to make it the default\&.
+.RE
+.PP
+\fB\-\-prompt==PROMPT\fR
+.RS 4
+Provides an alternative prompt prefix for this environment\&.
.SH "AUTHORS"
.sp
.if n \{\
More information about the Python-modules-commits
mailing list