[Python-modules-commits] r23113 - in packages/python-virtualenv/trunk/debian/patches (2 files)

[warsaw-guest at users.alioth.debian.org]

    Date: Friday, November 30, 2012 @ 19:33:08
  Author: warsaw-guest
Revision: 23113

Remove unnecessary patch (this has been applied upstream).

Modified:
  packages/python-virtualenv/trunk/debian/patches/series
Deleted:
  packages/python-virtualenv/trunk/debian/patches/add_setuptools_option.patch

Deleted: packages/python-virtualenv/trunk/debian/patches/add_setuptools_option.patch
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/add_setuptools_option.patch	2012-11-29 23:33:06 UTC (rev 23112)
+++ packages/python-virtualenv/trunk/debian/patches/add_setuptools_option.patch	2012-11-30 19:33:08 UTC (rev 23113)
@@ -1,28 +0,0 @@
-Description: Add --setuptools as an explicit option in virtualenv.py.
- This also allows the use of $VIRTUALENV_SETUPTOOLS environment variable to
- select setuptools over distribute.  This patch does not change the default
- (see next patch in series for that).
-Origin: https://github.com/warsaw/virtualenv/compare/develop...setuptools
-Author: Barry Warsaw <barry at python.org>
-
-diff --git a/virtualenv.py b/virtualenv.py
-index 8fdb275..92f48b9 100755
---- a/virtualenv.py
-+++ b/virtualenv.py
-@@ -858,6 +858,16 @@ def main():
-         help='Use Distribute instead of Setuptools. Set environ variable '
-         'VIRTUALENV_DISTRIBUTE to make it the default ')
- 
-+    parser.add_option(
-+        '--setuptools', 
-+        dest='use_distribute', 
-+        action='store_false',
-+        help='Use Setuptools instead of Distribute.  Set environ variable '
-+        'VIRTUALENV_SETUPTOOLS to make it the default ')
-+
-+    # Set this to True to use distribute by default, even in Python 2.
-+    parser.set_defaults(use_distribute=False)
-+
-     default_search_dirs = file_search_dirs()
-     parser.add_option(
-         '--extra-search-dir',

Modified: packages/python-virtualenv/trunk/debian/patches/series
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/series	2012-11-29 23:33:06 UTC (rev 23112)
+++ packages/python-virtualenv/trunk/debian/patches/series	2012-11-30 19:33:08 UTC (rev 23113)
@@ -1,4 +1,3 @@
 look_for_external_files.patch
-add_setuptools_option.patch
 use_distribute.patch
 system-python.patch