Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: freeze-exception Please unblock package python-virtualenv version in Squeeze installs virtualenv module into wrong namespace unblock python-virtualenv/1.4.9-3 -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores) Locale: LANG=pl_PL.UTF-8, LC_CTYPE=pl_PL.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- Do you like the idea of time-based freezes? Mention it in your signature in all mails to debian-release@l.d.o to encourage Release Team!
diff -Nru python-virtualenv-1.4.9/debian/changelog python-virtualenv-1.4.9/debian/changelog --- python-virtualenv-1.4.9/debian/changelog 2010-06-18 19:59:19.000000000 +0200 +++ python-virtualenv-1.4.9/debian/changelog 2010-08-22 15:55:50.000000000 +0200 @@ -1,3 +1,38 @@ +python-virtualenv (1.4.9-3) unstable; urgency=low + + * Team upload. + * Update look_for_external_files.patch to use /usr/share/python-virtualenv + + -- Piotr Ożarowski <piotr@debian.org> Sun, 22 Aug 2010 15:55:07 +0200 + +python-virtualenv (1.4.9-2) unstable; urgency=low + + * Team upload. + + [ Carl Chenet ] + * Renamed README.source to README.Debian + * Added debian/patches/look_for_external_files + - patch to store archives and eggs in /usr/share/python-virtualenv + * debian/control + - bump to 3.9.0 (No changes needed) + - moved python-pip to Recommends + * debian/rules + - removed overrides + - cleaning pysupport results + * debian/install + - corrected path to virtualenv.py. Closes: #588179 + * debian/python-virtualenv.lintian-overrides + - modified paths to lintian-overrides + + [ Piotr Ożarowski ] + * Install PIP tarball. Closes: 590824 + * Add add_distribute.patch (based on Barry Warsaw's one from Ubuntu) + * Install scripts/virtualenv instead of the one generated by setuptools + * Install docs/news.txt file as upstream changelog + * Bump Standards-Version to 3.9.1 (no changes needed) + + -- Piotr Ożarowski <piotr@debian.org> Sun, 22 Aug 2010 00:13:28 +0200 + python-virtualenv (1.4.9-1) unstable; urgency=low * New upstream version. Closes: #563993,#571411 diff -Nru python-virtualenv-1.4.9/debian/clean python-virtualenv-1.4.9/debian/clean --- python-virtualenv-1.4.9/debian/clean 1970-01-01 01:00:00.000000000 +0100 +++ python-virtualenv-1.4.9/debian/clean 2010-08-21 23:44:10.000000000 +0200 @@ -0,0 +1 @@ +virtualenv.egg-info/* diff -Nru python-virtualenv-1.4.9/debian/control python-virtualenv-1.4.9/debian/control --- python-virtualenv-1.4.9/debian/control 2010-06-15 22:49:29.000000000 +0200 +++ python-virtualenv-1.4.9/debian/control 2010-08-22 00:05:11.000000000 +0200 @@ -8,12 +8,13 @@ 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.8.4 +Standards-Version: 3.9.1 XS-Python-Version: all Package: python-virtualenv Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources, python-setuptools, python-pip (>= 0.7.2) +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 diff -Nru python-virtualenv-1.4.9/debian/docs python-virtualenv-1.4.9/debian/docs --- python-virtualenv-1.4.9/debian/docs 2010-06-18 19:59:19.000000000 +0200 +++ python-virtualenv-1.4.9/debian/docs 2010-08-22 00:05:49.000000000 +0200 @@ -1,3 +1 @@ docs/index.txt -docs/news.txt -debian/README.source diff -Nru python-virtualenv-1.4.9/debian/install python-virtualenv-1.4.9/debian/install --- python-virtualenv-1.4.9/debian/install 2010-06-15 22:49:29.000000000 +0200 +++ python-virtualenv-1.4.9/debian/install 2010-08-22 00:07:24.000000000 +0200 @@ -1,2 +1,3 @@ -virtualenv_support/ usr/share/pyshared/virtualenv/ -virtualenv.py usr/share/pyshared/virtualenv/ +virtualenv_support/*.tar.gz /usr/share/python-virtualenv/ +virtualenv_support/*.egg /usr/share/python-virtualenv/ +scripts/virtualenv /usr/bin/ diff -Nru python-virtualenv-1.4.9/debian/patches/add_distribute.patch python-virtualenv-1.4.9/debian/patches/add_distribute.patch --- python-virtualenv-1.4.9/debian/patches/add_distribute.patch 1970-01-01 01:00:00.000000000 +0100 +++ python-virtualenv-1.4.9/debian/patches/add_distribute.patch 2010-08-22 15:50:20.000000000 +0200 @@ -0,0 +1,54 @@ +Description: Add --distribute as an option in virtualenv.py + 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@debian.org> + +Index: python-virtualenv-1.4.9/virtualenv.py +=================================================================== +--- python-virtualenv-1.4.9.orig/virtualenv.py ++++ python-virtualenv-1.4.9/virtualenv.py +@@ -467,9 +467,16 @@ def main(): + parser.add_option( + '--distribute', + dest='use_distribute', +- action='store_true', +- 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 ' ++ 'to use Setuptools instead of Distribute.') ++ ++ parser.add_option( ++ '--setuptools', ++ dest='use_distribute', ++ action='store_false', ++ 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 + + + def create_environment(home_dir, site_packages=True, clear=False, +- unzip_setuptools=False, use_distribute=False): ++ unzip_setuptools=False, use_distribute=True): + """ + Creates a new environment in ``home_dir``. + +@@ -611,10 +618,10 @@ def create_environment(home_dir, site_pa + + install_distutils(lib_dir, home_dir) + +- if use_distribute or os.environ.get('VIRTUALENV_USE_DISTRIBUTE'): +- install_distribute(py_executable, unzip=unzip_setuptools) +- else: ++ if not use_distribute or os.environ.get('VIRTUALENV_USE_SETUPTOOLS'): + install_setuptools(py_executable, unzip=unzip_setuptools) ++ else: ++ install_distribute(py_executable, unzip=unzip_setuptools) + + install_pip(py_executable) + diff -Nru python-virtualenv-1.4.9/debian/patches/look_for_external_files.patch python-virtualenv-1.4.9/debian/patches/look_for_external_files.patch --- python-virtualenv-1.4.9/debian/patches/look_for_external_files.patch 1970-01-01 01:00:00.000000000 +0100 +++ python-virtualenv-1.4.9/debian/patches/look_for_external_files.patch 2010-08-22 15:50:49.000000000 +0200 @@ -0,0 +1,29 @@ +# Description: store files in /usr/share/python-virtualenv/ +# Author: Carl Chenet <chaica@ohmytux.com> + +Index: python-virtualenv-1.4.9/setup.py +=================================================================== +--- python-virtualenv-1.4.9.orig/setup.py ++++ python-virtualenv-1.4.9/setup.py +@@ -63,6 +63,6 @@ setup(name='virtualenv', + license='MIT', + py_modules=['virtualenv'], + packages=['virtualenv_support'], +- package_data={'virtualenv_support': ['*-py%s.egg' % sys.version[:3], '*.tar.gz']}, ++ #package_data={'virtualenv_support': ['*-py%s.egg' % sys.version[:3], '*.tar.gz']}, + **kw + ) +Index: virtualenv-1.4.9/virtualenv.py +=================================================================== +--- virtualenv-1.4.9.orig/virtualenv.py 2010-07-06 01:09:36.000000000 +0200 ++++ virtualenv-1.4.9/virtualenv.py 2010-07-06 02:20:52.000000000 +0200 +@@ -346,7 +346,8 @@ + def file_search_dirs(): + here = os.path.dirname(os.path.abspath(__file__)) + dirs = ['.', here, +- join(here, 'virtualenv_support')] ++ #join(here, 'virtualenv_support')] ++ '/usr/share/python-virtualenv/'] + if os.path.splitext(os.path.dirname(__file__))[0] != 'virtualenv': + # Probably some boot script; just in case virtualenv is installed... + try: diff -Nru python-virtualenv-1.4.9/debian/patches/series python-virtualenv-1.4.9/debian/patches/series --- python-virtualenv-1.4.9/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ python-virtualenv-1.4.9/debian/patches/series 2010-08-22 00:11:09.000000000 +0200 @@ -0,0 +1,2 @@ +look_for_external_files.patch +add_distribute.patch diff -Nru python-virtualenv-1.4.9/debian/python-virtualenv.lintian-overrides python-virtualenv-1.4.9/debian/python-virtualenv.lintian-overrides --- python-virtualenv-1.4.9/debian/python-virtualenv.lintian-overrides 2010-06-15 22:49:29.000000000 +0200 +++ python-virtualenv-1.4.9/debian/python-virtualenv.lintian-overrides 2010-08-22 00:07:42.000000000 +0200 @@ -3,6 +3,6 @@ # We don't have control over the egg format, and at any rate these # files are not intended to be executed as shell scripts. -python-virtualenv binary: script-not-executable ./usr/share/pyshared/virtualenv/virtualenv_support/setuptools-0.6c11-py2.4.egg -python-virtualenv binary: script-not-executable ./usr/share/pyshared/virtualenv/virtualenv_support/setuptools-0.6c11-py2.5.egg -python-virtualenv binary: script-not-executable ./usr/share/pyshared/virtualenv/virtualenv_support/setuptools-0.6c11-py2.6.egg +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 diff -Nru python-virtualenv-1.4.9/debian/README.Debian python-virtualenv-1.4.9/debian/README.Debian --- python-virtualenv-1.4.9/debian/README.Debian 1970-01-01 01:00:00.000000000 +0100 +++ python-virtualenv-1.4.9/debian/README.Debian 2010-08-22 00:06:20.000000000 +0200 @@ -0,0 +1,7 @@ +The pip command from the python-pip package should be used to install +applications in the environment created by virtualenv. + +The Virtualenv sources tarball provides the eggs for setuptools 2.4,2.5,2.6 +and tarballs of the pip project and distribute project. When no internet +connection is available, these files are required in order to setup +properly the environments. Otherwise virtualenv attempts to download them. \ Brak znaku nowej linii na końcu pliku diff -Nru python-virtualenv-1.4.9/debian/README.source python-virtualenv-1.4.9/debian/README.source --- python-virtualenv-1.4.9/debian/README.source 2010-06-18 19:59:19.000000000 +0200 +++ python-virtualenv-1.4.9/debian/README.source 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -The pip command from the python-pip package should be used to install -applications in the environment created by virtualenv. - -The Virtualenv sources tarball provides the pip sources tarball but -we can omit it thanks to the dependency of the python-virtualenv -package with the python-pip package. diff -Nru python-virtualenv-1.4.9/debian/rules python-virtualenv-1.4.9/debian/rules --- python-virtualenv-1.4.9/debian/rules 2010-06-18 19:59:19.000000000 +0200 +++ python-virtualenv-1.4.9/debian/rules 2010-08-22 00:07:54.000000000 +0200 @@ -1,18 +1,7 @@ #!/usr/bin/make -f -export DH_ALWAYS_EXCLUDE=pip-0.7.2.tar.gz - %: dh $@ -override_dh_auto_clean: - -override_dh_auto_build: - -override_dh_auto_install: - -override_dh_install: - dh_install - -override_dh_link: - dh_link usr/share/pyshared/virtualenv/virtualenv.py usr/bin/virtualenv +override_dh_installchangelogs: + dh_installchangelogs docs/news.txt diff -Nru python-virtualenv-1.4.9/debian/virtualenv.1 python-virtualenv-1.4.9/debian/virtualenv.1 --- python-virtualenv-1.4.9/debian/virtualenv.1 2010-06-03 19:07:08.000000000 +0200 +++ python-virtualenv-1.4.9/debian/virtualenv.1 2010-08-22 01:16:55.000000000 +0200 @@ -81,8 +81,14 @@ .PP \fB\-\-distribute\fR .RS 4 -Use Distribute instead of Setuptools\&. +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. .SH "AUTHORS" .sp .if n \{\
Attachment:
signature.asc
Description: Digital signature