diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/03_no-setuptools.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 3 insertions, 28 deletions
diff --git a/debian/changelog b/debian/changelog index 495ab62..b8d3ce6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ python-urllib3 (1.8.2-1) UNRELEASED; urgency=medium - Refreshed * debian/patches/02_require-cert-verification.patch - Refreshed + * debian/patches/03_no-setuptools.patch + - Superseded by debian/patches/setuptools.patch - -- Daniele Tricoli <eriol@mornie.org> Sat, 24 May 2014 19:12:41 +0200 + -- Daniele Tricoli <eriol@mornie.org> Sat, 24 May 2014 19:52:20 +0200 python-urllib3 (1.8-2) unstable; urgency=medium diff --git a/debian/patches/03_no-setuptools.patch b/debian/patches/03_no-setuptools.patch deleted file mode 100644 index ee2e913..0000000 --- a/debian/patches/03_no-setuptools.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Do not use setuptools. -Author: Daniele Tricoli <eriol@mornie.org> -Forwarded: not-needed -Last-Update: 2013-05-10 - ---- a/setup.py -+++ b/setup.py -@@ -5,11 +5,6 @@ - import os - import re - --try: -- import setuptools --except ImportError: -- pass # No 'develop' command, oh well. -- - base_path = os.path.dirname(__file__) - - # Get the version (borrowed from SQLAlchemy) -@@ -49,6 +44,4 @@ - 'urllib3.contrib', - ], - requires=requirements, -- tests_require=tests_requirements, -- test_suite='test', - ) diff --git a/debian/patches/series b/debian/patches/series index 52e03c4..a8d7977 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 01_do-not-use-embedded-python-six.patch 02_require-cert-verification.patch -03_no-setuptools.patch 04_relax_nosetests_options.patch setuptools.patch |