[Python-modules-commits] r14238 - in packages/python-virtualenv/trunk/debian (15 files)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Sat Aug 21 23:30:14 UTC 2010 

    Date: Saturday, August 21, 2010 @ 23:30:13
  Author: piotr
Revision: 14238

* Team upload.
  - patch to store archives and eggs in /usr/share/python-virtualenv
* 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)

Added:
  packages/python-virtualenv/trunk/debian/clean
  packages/python-virtualenv/trunk/debian/patches/add_distribute.patch
  packages/python-virtualenv/trunk/debian/patches/look_for_external_files.patch
    (from rev 14234, packages/python-virtualenv/trunk/debian/patches/look_for_external_files)
Modified:
  packages/python-virtualenv/trunk/debian/README.Debian
  packages/python-virtualenv/trunk/debian/changelog
  packages/python-virtualenv/trunk/debian/control
  packages/python-virtualenv/trunk/debian/copyright
  packages/python-virtualenv/trunk/debian/docs
  packages/python-virtualenv/trunk/debian/install
  packages/python-virtualenv/trunk/debian/patches/series
  packages/python-virtualenv/trunk/debian/python-virtualenv.lintian-overrides
  packages/python-virtualenv/trunk/debian/rules
  packages/python-virtualenv/trunk/debian/virtualenv.1
Deleted:
  packages/python-virtualenv/trunk/debian/patches/look_for_external_files
  packages/python-virtualenv/trunk/debian/virtualenv

Modified: packages/python-virtualenv/trunk/debian/README.Debian
===================================================================
--- packages/python-virtualenv/trunk/debian/README.Debian	2010-08-21 17:21:19 UTC (rev 14237)
+++ packages/python-virtualenv/trunk/debian/README.Debian	2010-08-21 23:30:13 UTC (rev 14238)
@@ -1,9 +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.
-
+properly the environments. Otherwise virtualenv attempts to download them.
\ No newline at end of file

Modified: packages/python-virtualenv/trunk/debian/changelog
===================================================================
--- packages/python-virtualenv/trunk/debian/changelog	2010-08-21 17:21:19 UTC (rev 14237)
+++ packages/python-virtualenv/trunk/debian/changelog	2010-08-21 23:30:13 UTC (rev 14238)
@@ -1,11 +1,11 @@
 python-virtualenv (1.4.9-2) unstable; urgency=low
 
-  * Added debian/virtualenv
-  * Added debian/patches
-  * Added debian/patches/series
+  * 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/virtualenv
+    - 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
@@ -13,15 +13,19 @@
     - removed overrides
     - cleaning pysupport results
   * debian/install
-    - added debian/virtualenv
     - corrected path to virtualenv.py. Closes: #588179 
   * debian/python-virtualenv.lintian-overrides
     - modified paths to lintian-overrides
-  * debian/copyright
-    - added copyright and license for debian/virtualenv
 
- -- Carl Chenet <chaica at ohmytux.com>  Sun, 25 Jul 2010 22:19:42 +0200
+  [ 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 at 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

Added: packages/python-virtualenv/trunk/debian/clean
===================================================================
--- packages/python-virtualenv/trunk/debian/clean	                        (rev 0)
+++ packages/python-virtualenv/trunk/debian/clean	2010-08-21 23:30:13 UTC (rev 14238)
@@ -0,0 +1 @@
+virtualenv.egg-info/*

Modified: packages/python-virtualenv/trunk/debian/control
===================================================================
--- packages/python-virtualenv/trunk/debian/control	2010-08-21 17:21:19 UTC (rev 14237)
+++ packages/python-virtualenv/trunk/debian/control	2010-08-21 23:30:13 UTC (rev 14238)
@@ -8,7 +8,7 @@
 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.0
+Standards-Version: 3.9.1
 XS-Python-Version: all
 
 Package: python-virtualenv

Modified: packages/python-virtualenv/trunk/debian/copyright
===================================================================
--- packages/python-virtualenv/trunk/debian/copyright	2010-08-21 17:21:19 UTC (rev 14237)
+++ packages/python-virtualenv/trunk/debian/copyright	2010-08-21 23:30:13 UTC (rev 14238)
@@ -1,9 +1,7 @@
 Original source may be found at: http://pypi.python.org/pypi/virtualenv
 
-Files: debian/* except debian/virtualenv
+Files: debian/*
 Copyright: Copyright 2007-2008 Jeff Licquia <licquia at debian.org>
-File: debian/virtualenv
-Copyright: Copyright 2010 Carl Chenet <chaica at ohmytux.com>
 License: other
     The Debian packaging informatin is licensed under the same license
     as the rest of virtualenv.

Modified: packages/python-virtualenv/trunk/debian/docs
===================================================================
--- packages/python-virtualenv/trunk/debian/docs	2010-08-21 17:21:19 UTC (rev 14237)
+++ packages/python-virtualenv/trunk/debian/docs	2010-08-21 23:30:13 UTC (rev 14238)
@@ -1,3 +1 @@
 docs/index.txt
-docs/news.txt
-debian/README.Debian

Modified: packages/python-virtualenv/trunk/debian/install
===================================================================
--- packages/python-virtualenv/trunk/debian/install	2010-08-21 17:21:19 UTC (rev 14237)
+++ packages/python-virtualenv/trunk/debian/install	2010-08-21 23:30:13 UTC (rev 14238)
@@ -1,2 +1,3 @@
-virtualenv_support/ usr/share/virtualenv/
-debian/virtualenv usr/bin
+virtualenv_support/*.tar.gz /usr/share/python-virtualenv/
+virtualenv_support/*.egg /usr/share/python-virtualenv/
+scripts/virtualenv /usr/bin/

Added: packages/python-virtualenv/trunk/debian/patches/add_distribute.patch
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/add_distribute.patch	                        (rev 0)
+++ packages/python-virtualenv/trunk/debian/patches/add_distribute.patch	2010-08-21 23:30:13 UTC (rev 14238)
@@ -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 at 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)
+ 

Deleted: packages/python-virtualenv/trunk/debian/patches/look_for_external_files
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/look_for_external_files	2010-08-21 17:21:19 UTC (rev 14237)
+++ packages/python-virtualenv/trunk/debian/patches/look_for_external_files	2010-08-21 23:30:13 UTC (rev 14238)
@@ -1,17 +0,0 @@
-# Description: store files in /usr/share/virtualenv/virtualenv_support
-# Author: Carl Chenet <chaica at ohmytux.com>
-
-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/virtualenv/virtualenv_support']
-     if os.path.splitext(os.path.dirname(__file__))[0] != 'virtualenv':
-         # Probably some boot script; just in case virtualenv is installed...
-         try:

Copied: packages/python-virtualenv/trunk/debian/patches/look_for_external_files.patch (from rev 14234, packages/python-virtualenv/trunk/debian/patches/look_for_external_files)
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/look_for_external_files.patch	                        (rev 0)
+++ packages/python-virtualenv/trunk/debian/patches/look_for_external_files.patch	2010-08-21 23:30:13 UTC (rev 14238)
@@ -0,0 +1,29 @@
+# Description: store files in /usr/share/python-virtualenv/
+# Author: Carl Chenet <chaica at 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/virtualenv/virtualenv_support']
+     if os.path.splitext(os.path.dirname(__file__))[0] != 'virtualenv':
+         # Probably some boot script; just in case virtualenv is installed...
+         try:

Modified: packages/python-virtualenv/trunk/debian/patches/series
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/series	2010-08-21 17:21:19 UTC (rev 14237)
+++ packages/python-virtualenv/trunk/debian/patches/series	2010-08-21 23:30:13 UTC (rev 14238)
@@ -1 +1,2 @@
-look_for_external_files
+look_for_external_files.patch
+add_distribute.patch

Modified: packages/python-virtualenv/trunk/debian/python-virtualenv.lintian-overrides
===================================================================
--- packages/python-virtualenv/trunk/debian/python-virtualenv.lintian-overrides	2010-08-21 17:21:19 UTC (rev 14237)
+++ packages/python-virtualenv/trunk/debian/python-virtualenv.lintian-overrides	2010-08-21 23:30:13 UTC (rev 14238)
@@ -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/virtualenv/virtualenv_support/setuptools-0.6c11-py2.4.egg
-python-virtualenv binary: script-not-executable ./usr/share/virtualenv/virtualenv_support/setuptools-0.6c11-py2.5.egg
-python-virtualenv binary: script-not-executable ./usr/share/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

Modified: packages/python-virtualenv/trunk/debian/rules
===================================================================
--- packages/python-virtualenv/trunk/debian/rules	2010-08-21 17:21:19 UTC (rev 14237)
+++ packages/python-virtualenv/trunk/debian/rules	2010-08-21 23:30:13 UTC (rev 14238)
@@ -3,7 +3,5 @@
 %:
 	dh $@
 
-override_dh_pysupport:
-	dh_pysupport
-	rm -rf debian/python-virtualenv/usr/lib
-	rm -rf debian/python-virtualenv/usr/share/pyshared/virtualenv_support/
+override_dh_installchangelogs:
+	dh_installchangelogs docs/news.txt

Deleted: packages/python-virtualenv/trunk/debian/virtualenv
===================================================================
--- packages/python-virtualenv/trunk/debian/virtualenv	2010-08-21 17:21:19 UTC (rev 14237)
+++ packages/python-virtualenv/trunk/debian/virtualenv	2010-08-21 23:30:13 UTC (rev 14238)
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-from virtualenv import main
-
-if __name__ == '__main__':
-    main()

Modified: packages/python-virtualenv/trunk/debian/virtualenv.1
===================================================================
--- packages/python-virtualenv/trunk/debian/virtualenv.1	2010-08-21 17:21:19 UTC (rev 14237)
+++ packages/python-virtualenv/trunk/debian/virtualenv.1	2010-08-21 23:30:13 UTC (rev 14238)
@@ -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 \{\

More information about the Python-modules-commits mailing list